remove duplicate deletion

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index abc9a9fea0f0e8532e8f90809382e45fe99fc205..7bfc477e35f54819d4a66952fbe8d6eae66f1ef9 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -13,6 +13,8 @@
 
 #include "wx/bmpbuttn.h"
 
+#if wxUSE_BMPBUTTON
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -43,7 +45,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!button->HasVMT()) return;
+    if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
   
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
@@ -57,7 +59,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
 static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (!button->HasVMT()) return;
+    if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     button->HasFocus(); 
@@ -69,7 +71,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
 static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (!button->HasVMT()) return;
+    if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     button->NotFocus(); 
@@ -81,7 +83,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
 static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (!button->HasVMT()) return;
+    if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     button->StartSelect(); 
@@ -93,7 +95,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
 static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (!button->HasVMT()) return;
+    if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     button->EndSelect(); 
@@ -120,7 +122,9 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
     PreCreation( parent, id, pos, newSize, style, name );
   
+#if wxUSE_VALIDATORS
     SetValidator( validator );
+#endif
 
     m_bitmap   = bitmap;
     m_disabled = bitmap;
@@ -144,14 +148,14 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     
         gtk_widget_show( pixmap );
         gtk_container_add( GTK_CONTAINER(m_widget), pixmap );
+       
+        int border = 10;
+        if (style & wxNO_BORDER) border = 4;
+        if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
+        if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
+        SetSize( newSize.x, newSize.y );
     }
   
-    int border = 10;
-    if (style & wxNO_BORDER) border = 4;
-    if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
-    if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
-    SetSize( newSize.x, newSize.y );
-  
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
@@ -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 );
  
-    m_parent->AddChild( this );
-
-    m_parent->InsertChild( this );
+    m_parent->DoAddChild( this );
   
     PostCreation();
   
@@ -311,3 +313,5 @@ void wxBitmapButton::EndSelect()
     m_isSelected = FALSE;
     SetBitmap();
 }
+
+#endif
\ No newline at end of file