fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index eda28f66802d71cb423d06c08570d408efc2590e..7920f09130c27f6e1849f192ddf536bbc0ef18bd 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -40,7 +40,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);

-    button->GetEventHandler()->ProcessEvent(event);
+    button->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -54,7 +54,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->HasFocus();
+    button->GTKMouseEnters();

 }
 }
 
 }
 }
 


@@ -68,7 +68,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->NotFocus();
+    button->GTKMouseLeaves();

 }
 }
 
 }
 }
 


@@ -82,7 +82,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->StartSelect();
+    button->GTKPressed();

 }
 }
 
 }
 }
 


@@ -96,7 +96,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->EndSelect();
+    button->GTKReleased();

 }
 }
 
 }
 }
 


@@ -106,10 +106,16 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 

+BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
+    EVT_SET_FOCUS(wxBitmapButton::OnFocusChange)
+    EVT_KILL_FOCUS(wxBitmapButton::OnFocusChange)
+END_EVENT_TABLE()
+
+

 void wxBitmapButton::Init()
 {
 void wxBitmapButton::Init()
 {

-    m_hasFocus =
-    m_isSelected = false;
+    m_mouseHovers =
+    m_isPressed = false;

 }
 
 bool wxBitmapButton::Create( wxWindow *parent,
 }
 
 bool wxBitmapButton::Create( wxWindow *parent,


@@ -131,6 +137,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
     m_bmpNormal = bitmap;
 
     m_widget = gtk_button_new();
     m_bmpNormal = bitmap;
 
     m_widget = gtk_button_new();

+    g_object_ref(m_widget);

 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );


@@ -184,41 +191,30 @@ void wxBitmapButton::OnSetBitmap()
     wxBitmap the_one;
     if (!IsThisEnabled())
         the_one = m_bmpDisabled;
     wxBitmap the_one;
     if (!IsThisEnabled())
         the_one = m_bmpDisabled;

-    else if (m_isSelected)
+    else if (m_isPressed)

         the_one = m_bmpSelected;
         the_one = m_bmpSelected;

-    else if (m_hasFocus)
+    else if (m_mouseHovers)
+        the_one = m_bmpHover;
+    else if (HasFocus())

         the_one = m_bmpFocus;
     else
         the_one = m_bmpNormal;
 
         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 (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
+    if (!the_one.Ok())
+        the_one = m_bmpNormal;
+    if (!the_one.Ok())
+        return;

 
 

-    GtkWidget *child = GTK_BIN(m_widget)->child;
-    if (child == NULL)
+    GtkWidget* image = GTK_BIN(m_widget)->child;
+    if (image == 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);
-
-        gtk_widget_show(pixmap);
-        gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
-    }
-    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);
+        image = gtk_image_new();
+        gtk_widget_show(image);
+        gtk_container_add(GTK_CONTAINER(m_widget), image);

     }
     }

+    // always use pixbuf, because pixmap mask does not
+    // work with disabled images in some themes
+    gtk_image_set_from_pixbuf(GTK_IMAGE(image), the_one.GetPixbuf());

 }
 
 wxSize wxBitmapButton::DoGetBestSize() const
 }
 
 wxSize wxBitmapButton::DoGetBestSize() const


@@ -236,27 +232,33 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKMouseEnters()
+{
+    m_mouseHovers = true;
+    OnSetBitmap();
+}
+
+void wxBitmapButton::GTKMouseLeaves()

 {
 {

-    m_hasFocus = true;
+    m_mouseHovers = false;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKPressed()

 {
 {

-    m_hasFocus = false;
+    m_isPressed = true;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxBitmapButton::StartSelect()
+void wxBitmapButton::GTKReleased()

 {
 {

-    m_isSelected = true;
+    m_isPressed = false;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxBitmapButton::EndSelect()
+void wxBitmapButton::OnFocusChange(wxFocusEvent& event)

 {
 {

-    m_isSelected = false;
+    event.Skip();

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }