Place the search icon in the primary slot of the entry

[~andy/gtk] / gtk / gtkvolumebutton.h

diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 069c1228a619d33c1818eaf5ca470471485cf921..74a1ca6d3989bf535e4dfa673fce57a26bc839eb 100644 (file)
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -15,28 +15,30 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 2007.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_VOLUME_BUTTON_H__
 #define __GTK_VOLUME_BUTTON_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkscalebutton.h>
 
 G_BEGIN_DECLS
 
 #define GTK_TYPE_VOLUME_BUTTON                 (gtk_volume_button_get_type ())
 #define GTK_VOLUME_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButton))
-#define GTK_VOLUME_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VOLUME_BUTTON, GtkVolumeeButtonClass))
+#define GTK_VOLUME_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButtonClass))
 #define GTK_IS_VOLUME_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VOLUME_BUTTON))
 #define GTK_IS_VOLUME_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VOLUME_BUTTON))
 #define GTK_VOLUME_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VOLUME_BUTTON, GtkVolumeButtonClass))
@@ -44,6 +46,11 @@ G_BEGIN_DECLS
 typedef struct _GtkVolumeButton       GtkVolumeButton;
 typedef struct _GtkVolumeButtonClass  GtkVolumeButtonClass;
 
+struct _GtkVolumeButton
+{
+  GtkScaleButton  parent;
+};
+
 struct _GtkVolumeButtonClass
 {
   GtkScaleButtonClass parent_class;
@@ -61,4 +68,3 @@ GtkWidget*    gtk_volume_button_new           (void);
 G_END_DECLS
 
 #endif /* __GTK_VOLUME_BUTTON_H__ */
-