Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 8ab5eaa6cd3f4c9bb9eacc91b9625c1da5ad7a62..109281084a87bcb6ce07c85344c09c54332f84d2 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/bmpbuttn.cpp
+// Name:        src/gtk1/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 "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -52,7 +50,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
-    button->GetEventHandler()->ProcessEvent(event);
+    button->HandleWindowEvent(event);
 }
 }
 
@@ -66,7 +64,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->HasFocus();
+    button->GTKSetHasFocus();
 }
 }
 
@@ -80,7 +78,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->NotFocus();
+    button->GTKSetNotFocus();
 }
 }
 
@@ -116,8 +114,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-
 void wxBitmapButton::Init()
 {
     m_hasFocus =
@@ -143,14 +139,14 @@ bool wxBitmapButton::Create( wxWindow *parent,
         return false;
     }
 
-    m_bmpNormal = bitmap;
+    m_bitmaps[State_Normal] = bitmap;
 
     m_widget = gtk_button_new();
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
-    if (m_bmpNormal.Ok())
+    if (bitmap.IsOk())
     {
         OnSetBitmap();
     }
@@ -174,14 +170,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") );
@@ -204,19 +192,21 @@ void wxBitmapButton::OnSetBitmap()
     InvalidateBestSize();
 
     wxBitmap the_one;
-    if (!m_isEnabled)
-        the_one = m_bmpDisabled;
-    else if (m_isSelected)
-        the_one = m_bmpSelected;
-    else if (m_hasFocus)
-        the_one = m_bmpFocus;
-    else
-        the_one = m_bmpNormal;
-
-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
+    if (!IsThisEnabled())
+        the_one = GetBitmapDisabled();
+   else if (m_isSelected)
+     the_one = GetBitmapPressed();
+   else if (HasFocus())
+     the_one = GetBitmapFocus();
+
+   if (!the_one.IsOk())
+     {
+         the_one = GetBitmapLabel();
+         if (!the_one.IsOk())
+             return;
+     }
+
+    GdkBitmap *mask = NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
     GtkWidget *child = BUTTON_CHILD(m_widget);
@@ -224,29 +214,14 @@ void wxBitmapButton::OnSetBitmap()
     {
         // initial bitmap
         GtkWidget *pixmap;
-#ifdef __WXGTK20__
-        if (the_one.HasPixbuf())
-            pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
-        else
-            pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
-#else
         pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
-#endif
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
     }
     else
     {   // subsequent bitmaps
-#ifdef __WXGTK20__
-        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);
-#else
         GtkPixmap *pixmap = GTK_PIXMAP(child);
         gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);
-#endif
     }
 }
 
@@ -265,13 +240,13 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKSetHasFocus()
 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKSetNotFocus()
 {
     m_hasFocus = false;
     OnSetBitmap();
@@ -290,4 +265,3 @@ void wxBitmapButton::EndSelect()
 }
 
 #endif // wxUSE_BMPBUTTON
-