Oops.

[wxWidgets.git] / src / gtk1 / bmpbuttn.cpp

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 783d419baadeb81fc709d27a99008e64cc3f0bd5..6661b99efde4bea6a01902825dc0e0e8e9198e81 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -13,6 +13,8 @@
 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

+#if wxUSE_BMPBUTTON
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 


@@ -120,7 +122,9 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
     PreCreation( parent, id, pos, newSize, style, name );
   
 
     PreCreation( parent, id, pos, newSize, style, name );
   

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif

 
     m_bitmap   = bitmap;
     m_disabled = bitmap;
 
     m_bitmap   = bitmap;
     m_disabled = bitmap;


@@ -164,9 +168,7 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     gtk_signal_connect( GTK_OBJECT(m_widget), "released", 
       GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
  
     gtk_signal_connect( GTK_OBJECT(m_widget), "released", 
       GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
  

-    m_parent->AddChild( this );
-
-    m_parent->InsertChild( this );
+    m_parent->DoAddChild( this );

   
     PostCreation();
   
   
     PostCreation();
   


@@ -311,3 +313,5 @@ void wxBitmapButton::EndSelect()
     m_isSelected = FALSE;
     SetBitmap();
 }
     m_isSelected = FALSE;
     SetBitmap();
 }

+
+#endif
\ No newline at end of file