added script for generating tags file for wxGTK

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index ca651c8b61467b2fc84dfee1ba72c845d2eed271..2c7762f095f50ce27ca3ccd6c182dabbbc6fc92f 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -7,18 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "bmpbuttn.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -110,13 +112,20 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
 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;
@@ -135,19 +144,17 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
     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 );
-#endif
 
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;
-        int border = (style & wxNO_BORDER) ? 4 : 10;
+        wxSize bestSize = DoGetBestSize();
         if (newSize.x == -1)
-            newSize.x = m_bmpNormal.GetWidth()+border;
+            newSize.x = bestSize.x;
         if (newSize.y == -1)
-            newSize.y = m_bmpNormal.GetHeight()+border;
+            newSize.y = bestSize.y;
         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }
@@ -167,8 +174,7 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     m_parent->DoAddChild( this );
 
     PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    InheritAttributes();
 
     Show( TRUE );
 
@@ -199,7 +205,8 @@ wxString wxBitmapButton::GetLabel() const
 
 void wxBitmapButton::ApplyWidgetStyle()
 {
-    if (GTK_BUTTON(m_widget)->child == NULL) return;
+    if ( !BUTTON_CHILD(m_widget) )
+        return;
 
     wxButton::ApplyWidgetStyle();
 }
@@ -236,8 +243,8 @@ void wxBitmapButton::OnSetBitmap()
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
-    GtkButton *bin = GTK_BUTTON(m_widget);
-    if (bin->child == NULL)
+    GtkWidget *child = BUTTON_CHILD(m_widget);
+    if (child == NULL)
     {
         // initial bitmap
         GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
@@ -246,11 +253,24 @@ void wxBitmapButton::OnSetBitmap()
     }
     else
     {   // subsequent bitmaps
-        GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child);
+        GtkPixmap *g_pixmap = GTK_PIXMAP(child);
         gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
     }
 }
 
+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;
+}
+
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )