X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ac9fdc52ee871526c814059a46f34c6188de389..d968078adbfb147e913b9a33fc54242a36f117ce:/src/gtk/bmpbuttn.cpp

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 4930087382..ac1cec221d 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/bmpbuttn.cpp
+// Name:        src/gtk/bmpbuttn.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,13 +10,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
 
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // classes
@@ -24,13 +22,6 @@
 
 class wxBitmapButton;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -44,15 +35,12 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
-    button->GetEventHandler()->ProcessEvent(event);
+    button->HandleWindowEvent(event);
 }
 }
 
@@ -66,7 +54,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->HasFocus();
+    button->GTKHasFocus();
 }
 }
 
@@ -80,7 +68,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->NotFocus();
+    button->GTKNotFocus();
 }
 }
 
@@ -94,7 +82,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->StartSelect();
+    button->GTKStartSelect();
 }
 }
 
@@ -108,7 +96,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->EndSelect();
+    button->GTKEndSelect();
 }
 }
 
@@ -133,9 +121,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
                              const wxValidator& validator,
                              const wxString &name )
 {
-    m_needParent = true;
-    m_acceptsFocus = true;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
@@ -175,14 +160,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
-void wxBitmapButton::SetDefault()
-{
-    GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
-    gtk_widget_grab_default( m_widget );
-
-    SetSize( m_x, m_y, m_width, m_height );
-}
-
 void wxBitmapButton::SetLabel( const wxString &label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
@@ -205,7 +182,7 @@ void wxBitmapButton::OnSetBitmap()
     InvalidateBestSize();
 
     wxBitmap the_one;
-    if (!m_isEnabled)
+    if (!IsThisEnabled())
         the_one = m_bmpDisabled;
     else if (m_isSelected)
         the_one = m_bmpSelected;
@@ -217,19 +194,12 @@ void wxBitmapButton::OnSetBitmap()
     if (!the_one.Ok()) the_one = m_bmpNormal;
     if (!the_one.Ok()) return;
 
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
-
     GtkWidget *child = GTK_BIN(m_widget)->child;
     if (child == NULL)
     {
         // initial bitmap
-        GtkWidget *pixmap;
-
-        if (the_one.HasPixbuf())
-            pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
-        else
-            pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
+        GtkWidget *pixmap = 
+            gtk_image_new_from_pixbuf(the_one.GetPixbuf());
 
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
@@ -237,10 +207,7 @@ void wxBitmapButton::OnSetBitmap()
     else
     {   // subsequent bitmaps
         GtkImage *pixmap = GTK_IMAGE(child);
-        if (the_one.HasPixbuf())
-            gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
-        else
-            gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
+        gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
     }
 }
 
@@ -259,25 +226,25 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKHasFocus()
 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKNotFocus()
 {
     m_hasFocus = false;
     OnSetBitmap();
 }
 
-void wxBitmapButton::StartSelect()
+void wxBitmapButton::GTKStartSelect()
 {
     m_isSelected = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::EndSelect()
+void wxBitmapButton::GTKEndSelect()
 {
     m_isSelected = false;
     OnSetBitmap();