Use the current font for the DoGetBestSize calculation

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index dc359f07c7144148812a157cac98599882d2540c..bbf20444765c98049dab9e169686b9323b8831d4 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -1,22 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        gtk/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:    wxWindows licence
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "bmpbuttn.h"
 #endif
 
 #pragma implementation "bmpbuttn.h"
 #endif
 

-#include "wx/bmpbuttn.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"

 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

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

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


@@ -41,65 +45,75 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
 // "clicked"
 //-----------------------------------------------------------------------------
 

+extern "C" {

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

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
         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);
 }
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);
 }

+}

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

+extern "C" {

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

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

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

+extern "C" {

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

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

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

+extern "C" {

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

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

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

+extern "C" {

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

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

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -108,84 +122,67 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 

-wxBitmapButton::wxBitmapButton()
+void wxBitmapButton::Init()

 {
 {

+    m_hasFocus =
+    m_isSelected = FALSE;

 }
 
 }
 

-bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-                             const wxPoint &pos, const wxSize &size, 
-                             long style, const wxValidator& validator, const wxString &name )
+bool wxBitmapButton::Create( wxWindow *parent,
+                             wxWindowID id,
+                             const wxBitmap& bitmap,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             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_bitmap   = bitmap;
-    m_disabled = bitmap;
-    m_focus    = bitmap;
-    m_selected = bitmap;
-  
-    m_label = "";
-  
+    m_bmpNormal = bitmap;
+

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

-#if (GTK_MINOR_VERSION > 0)    

     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 );

-#endif

 
 

-    if (m_bitmap.Ok())
+    if (m_bmpNormal.Ok())

     {
     {

-        wxSize newSize = size;
-
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-        GtkWidget *pixmap = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-    
-        gtk_widget_show( pixmap );
-        gtk_container_add( GTK_CONTAINER(m_widget), pixmap );
-       
-        int border = 10;
-        if (style & wxNO_BORDER) border = 4;
-        if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
-        if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
-        SetSize( newSize.x, newSize.y );
+        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_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "enter", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "enter",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );

-    gtk_signal_connect( GTK_OBJECT(m_widget), "leave", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "leave",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );

-    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );

-    gtk_signal_connect( GTK_OBJECT(m_widget), "released", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "released",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );

- 
+

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

-  
-    PostCreation();
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );

 
 

-    Show( TRUE );
-    
+    PostCreation(size);
+

     return TRUE;
 }
     return TRUE;
 }

-      
+

 void wxBitmapButton::SetDefault()
 {
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 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 );
 }
 
     SetSize( m_x, m_y, m_width, m_height );
 }
 


@@ -203,83 +200,82 @@ wxString wxBitmapButton::GetLabel() const
     return wxControl::GetLabel();
 }
 
     return wxControl::GetLabel();
 }
 

-void wxBitmapButton::ApplyWidgetStyle()
+void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

+    if ( !BUTTON_CHILD(m_widget) )
+        return;
+
+    wxButton::DoApplyWidgetStyle(style);

 }
 
 }
 

-void wxBitmapButton::SetBitmap()
+void wxBitmapButton::OnSetBitmap()

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );

 
 

+    InvalidateBestSize();
+    

     wxBitmap the_one;
     wxBitmap the_one;

-  
-    if (!m_isEnabled) 
-        the_one = m_disabled;
-    else 
+    if (!m_isEnabled)
+        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_selected;
-       }
-        else 
-       {
-            if (m_hasFocus) 
-               the_one = m_focus;
-            else 
-               the_one = m_bitmap;
+        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_bitmap;
+    if (!the_one.Ok()) the_one = m_bmpNormal;

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

-  
-    GtkButton *bin = GTK_BUTTON( m_widget );
-    GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
-  
+

     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();

-  
-    gtk_pixmap_set( g_pixmap, the_one.GetPixmap(), mask );
-}
-
-void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) 
-{
-  wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
-
-  if ( ! m_disabled.Ok() ) return;
-  m_disabled = bitmap;
-
-  SetBitmap();
-}
-
-void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) 
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
-
-    if ( ! m_focus.Ok() ) return;
-    m_focus = bitmap;
-
-    SetBitmap();
-}

 
 

-void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
-
-    if (!m_bitmap.Ok()) return;
-    m_bitmap = bitmap;
-  
-    SetBitmap();
+    GtkWidget *child = BUTTON_CHILD(m_widget);
+    if (child == 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
+    }

 }
 
 }
 

-void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
+wxSize wxBitmapButton::DoGetBestSize() const

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
-
-    if ( ! m_selected.Ok() ) return;
-    m_selected = bitmap;
-
-    SetBitmap();
+    return wxControl::DoGetBestSize();

 }
 
 bool wxBitmapButton::Enable( bool enable )
 }
 
 bool wxBitmapButton::Enable( bool enable )


@@ -287,7 +283,7 @@ bool wxBitmapButton::Enable( bool enable )
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 

-    SetBitmap();
+    OnSetBitmap();

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -295,25 +291,26 @@ bool wxBitmapButton::Enable( bool enable )
 void wxBitmapButton::HasFocus()
 {
     m_hasFocus = TRUE;
 void wxBitmapButton::HasFocus()
 {
     m_hasFocus = TRUE;

-    SetBitmap();
+    OnSetBitmap();

 }
 
 void wxBitmapButton::NotFocus()
 {
     m_hasFocus = FALSE;
 }
 
 void wxBitmapButton::NotFocus()
 {
     m_hasFocus = FALSE;

-    SetBitmap();
+    OnSetBitmap();

 }
 
 void wxBitmapButton::StartSelect()
 {
     m_isSelected = TRUE;
 }
 
 void wxBitmapButton::StartSelect()
 {
     m_isSelected = TRUE;

-    SetBitmap();
+    OnSetBitmap();

 }
 
 void wxBitmapButton::EndSelect()
 {
     m_isSelected = FALSE;
 }
 
 void wxBitmapButton::EndSelect()
 {
     m_isSelected = FALSE;

-    SetBitmap();
+    OnSetBitmap();

 }
 }

-#endif
+
+#endif // wxUSE_BMPBUTTON