Fixed wxRichTextCtrl base class

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index b71a04884d74a3a0368b47b4f3836275afa59670..7920f09130c27f6e1849f192ddf536bbc0ef18bd 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,13 +10,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
 
 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
 

-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -24,13 +22,6 @@
 
 class wxBitmapButton;
 
 
 class wxBitmapButton;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -44,15 +35,12 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
 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);
     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;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

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

 }
 }
 
 }
 }
 


@@ -80,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();

 }
 }
 
 }
 }
 


@@ -94,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();

 }
 }
 
 }
 }
 


@@ -108,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();

 }
 }
 
 }
 }
 


@@ -118,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,


@@ -133,9 +127,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
                              const wxValidator& validator,
                              const wxString &name )
 {
                              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 ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -146,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 );


@@ -155,17 +147,18 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
         OnSetBitmap();
     }
 

-    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_bmpbutton_clicked_callback),
+                            this);

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "leave",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "released",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
+    g_signal_connect (m_widget, "enter",
+                      G_CALLBACK (gtk_bmpbutton_enter_callback), this);
+    g_signal_connect (m_widget, "leave",
+                      G_CALLBACK (gtk_bmpbutton_leave_callback), this);
+    g_signal_connect (m_widget, "pressed",
+                      G_CALLBACK (gtk_bmpbutton_press_callback), this);
+    g_signal_connect (m_widget, "released",
+                      G_CALLBACK (gtk_bmpbutton_release_callback), this);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -174,14 +167,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
     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") );
 void wxBitmapButton::SetLabel( const wxString &label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );


@@ -189,16 +174,9 @@ void wxBitmapButton::SetLabel( const wxString &label )
     wxControl::SetLabel( label );
 }
 
     wxControl::SetLabel( label );
 }
 

-wxString wxBitmapButton::GetLabel() const
-{
-    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") );
-
-    return wxControl::GetLabel();
-}
-

 void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    if ( !BUTTON_CHILD(m_widget) )
+    if (!GTK_BIN(m_widget)->child)

         return;
 
     wxButton::DoApplyWidgetStyle(style);
         return;
 
     wxButton::DoApplyWidgetStyle(style);


@@ -211,50 +189,32 @@ void wxBitmapButton::OnSetBitmap()
     InvalidateBestSize();
 
     wxBitmap the_one;
     InvalidateBestSize();
 
     wxBitmap the_one;

-    if (!m_isEnabled)
+    if (!IsThisEnabled())

         the_one = m_bmpDisabled;
         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 = BUTTON_CHILD(m_widget);
-    if (child == NULL)
+    GtkWidget* image = GTK_BIN(m_widget)->child;
+    if (image == NULL)

     {
     {

-        // 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
+        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


@@ -272,29 +232,34 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKMouseEnters()

 {
 {

-    m_hasFocus = true;
+    m_mouseHovers = true;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

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

 {
 {

-    m_hasFocus = false;
+    m_mouseHovers = false;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

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

 {
 {

-    m_isSelected = true;
+    m_isPressed = true;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

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

 {
 {

-    m_isSelected = false;
+    m_isPressed = false;

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-#endif // wxUSE_BMPBUTTON
+void wxBitmapButton::OnFocusChange(wxFocusEvent& event)
+{
+    event.Skip();
+    OnSetBitmap();
+}

 
 

+#endif // wxUSE_BMPBUTTON