Better fix

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 55c431e1351c96e66f9a9c15d41d394caf81fc97..a814ea7a317838d0057c72c6fc352753eba88be7 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -1,26 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/bmpbuttn.cpp
+// Name:        src/gtk1/bmpbuttn.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bmpbuttn.h"
-#endif
-

 // 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 "wx/gtk1/private.h"

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


@@ -45,6 +39,7 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "clicked"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (g_isIdle)
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (g_isIdle)


@@ -55,13 +50,15 @@ 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);
+}

 }
 
 //-----------------------------------------------------------------------------
 // "enter"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "enter"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
 static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;


@@ -69,11 +66,13 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
     button->HasFocus();
 }
 
     button->HasFocus();
 }

+}

 
 //-----------------------------------------------------------------------------
 // "leave"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "leave"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
 static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;


@@ -81,11 +80,13 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
     button->NotFocus();
 }
 
     button->NotFocus();
 }

+}

 
 //-----------------------------------------------------------------------------
 // "pressed"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "pressed"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
 static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;


@@ -93,11 +94,13 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
     button->StartSelect();
 }
 
     button->StartSelect();
 }

+}

 
 //-----------------------------------------------------------------------------
 // "released"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "released"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
 static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;


@@ -105,6 +108,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
     button->EndSelect();
 }
 
     button->EndSelect();
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton


@@ -115,7 +119,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 void wxBitmapButton::Init()
 {
     m_hasFocus =
 void wxBitmapButton::Init()
 {
     m_hasFocus =

-    m_isSelected = FALSE;
+    m_isSelected = false;

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


@@ -127,20 +131,17 @@ bool wxBitmapButton::Create( wxWindow *parent,
                              const wxValidator& validator,
                              const wxString &name )
 {
                              const wxValidator& validator,
                              const wxString &name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxBitmapButton creation failed") );

-        return FALSE;
+        return false;

     }
 
     }
 

-    m_bmpNormal   =
-    m_bmpDisabled =
-    m_bmpFocus    =
-    m_bmpSelected = bitmap;
+    m_bmpNormal = bitmap;

 
     m_widget = gtk_button_new();
 
 
     m_widget = gtk_button_new();
 


@@ -152,7 +153,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
         OnSetBitmap();
     }
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",


@@ -168,15 +169,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    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 );
+    return true;

 }
 
 void wxBitmapButton::SetLabel( const wxString &label )
 }
 
 void wxBitmapButton::SetLabel( const wxString &label )


@@ -186,46 +179,29 @@ void wxBitmapButton::SetLabel( const wxString &label )
     wxControl::SetLabel( label );
 }
 
     wxControl::SetLabel( label );
 }
 

-wxString wxBitmapButton::GetLabel() const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
-
-    return wxControl::GetLabel();
-}
-
-void wxBitmapButton::ApplyWidgetStyle()
+void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
     if ( !BUTTON_CHILD(m_widget) )
         return;
 
 {
     if ( !BUTTON_CHILD(m_widget) )
         return;
 

-    wxButton::ApplyWidgetStyle();
+    wxButton::DoApplyWidgetStyle(style);

 }
 
 void wxBitmapButton::OnSetBitmap()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
 
 }
 
 void wxBitmapButton::OnSetBitmap()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
 

+    InvalidateBestSize();
+

     wxBitmap the_one;
     wxBitmap the_one;

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

         the_one = m_bmpDisabled;
     else if (m_isSelected)
         the_one = m_bmpSelected;
     else if (m_hasFocus)
         the_one = m_bmpFocus;
     else
         the_one = m_bmpDisabled;
     else if (m_isSelected)
         the_one = m_bmpSelected;
     else if (m_hasFocus)
         the_one = m_bmpFocus;
     else

-    {
-        if (m_isSelected)
-        {
-            the_one = m_bmpSelected;
-        }
-        else
-        {
-            if (m_hasFocus)
-                the_one = m_bmpFocus;
-            else
-                the_one = m_bmpNormal;
-        }
-    }
+        the_one = m_bmpNormal;

 
     if (!the_one.Ok()) the_one = m_bmpNormal;
     if (!the_one.Ok()) return;
 
     if (!the_one.Ok()) the_one = m_bmpNormal;
     if (!the_one.Ok()) return;


@@ -237,63 +213,55 @@ void wxBitmapButton::OnSetBitmap()
     if (child == NULL)
     {
         // initial bitmap
     if (child == NULL)
     {
         // initial bitmap

-        GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
+        GtkWidget *pixmap;
+        pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);

         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
     }
     else
     {   // subsequent bitmaps
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
     }
     else
     {   // subsequent bitmaps

-        GtkPixmap *g_pixmap = GTK_PIXMAP(child);
-        gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
+        GtkPixmap *pixmap = GTK_PIXMAP(child);
+        gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);

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

-    wxSize best;
-    
-    if (m_bmpNormal.Ok())
-    {
-        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
-        best.x = m_bmpNormal.GetWidth()+border;
-        best.y = m_bmpNormal.GetHeight()+border;
-    }
-    return best;
+    return wxControl::DoGetBestSize();

 }
 
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
 }
 
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )

-        return FALSE;
+        return false;

 
     OnSetBitmap();
 
 
     OnSetBitmap();
 

-    return TRUE;
+    return true;

 }
 
 void wxBitmapButton::HasFocus()
 {
 }
 
 void wxBitmapButton::HasFocus()
 {

-    m_hasFocus = TRUE;
+    m_hasFocus = true;

     OnSetBitmap();
 }
 
 void wxBitmapButton::NotFocus()
 {
     OnSetBitmap();
 }
 
 void wxBitmapButton::NotFocus()
 {

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

     OnSetBitmap();
 }
 
 void wxBitmapButton::StartSelect()
 {
     OnSetBitmap();
 }
 
 void wxBitmapButton::StartSelect()
 {

-    m_isSelected = TRUE;
+    m_isSelected = true;

     OnSetBitmap();
 }
 
 void wxBitmapButton::EndSelect()
 {
     OnSetBitmap();
 }
 
 void wxBitmapButton::EndSelect()
 {

-    m_isSelected = FALSE;
+    m_isSelected = false;

     OnSetBitmap();
 }
 
 #endif // wxUSE_BMPBUTTON
     OnSetBitmap();
 }
 
 #endif // wxUSE_BMPBUTTON

-