Wrong #ifdef for GTK 1.2

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 59e2e0a85686f8305df9329d3c52c86fd79634f9..25567ce3690b931e64f300b954cef86a27bef3b2 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -17,8 +17,7 @@
 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

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

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


@@ -144,10 +143,12 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     {
         wxSize newSize = size;
         int border = (style & wxNO_BORDER) ? 4 : 10;
     {
         wxSize newSize = size;
         int border = (style & wxNO_BORDER) ? 4 : 10;

-        if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
-        if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
+        if (newSize.x == -1)
+            newSize.x = m_bmpNormal.GetWidth()+border;
+        if (newSize.y == -1)
+            newSize.y = m_bmpNormal.GetHeight()+border;

         SetSize( newSize.x, newSize.y );
         SetSize( newSize.x, newSize.y );

-        SetBitmap();
+        OnSetBitmap();

     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
     }
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",


@@ -197,22 +198,23 @@ wxString wxBitmapButton::GetLabel() const
 
 void wxBitmapButton::ApplyWidgetStyle()
 {
 
 void wxBitmapButton::ApplyWidgetStyle()
 {

-    if (GTK_BUTTON(m_widget)->child == NULL) return;
-    
+    if ( !BUTTON_CHILD(m_widget) )
+        return;
+

     wxButton::ApplyWidgetStyle();
 }
 
     wxButton::ApplyWidgetStyle();
 }
 

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

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
 
     wxBitmap the_one;
     if (!m_isEnabled)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
 
     wxBitmap the_one;
     if (!m_isEnabled)

-        the_one = m_disabled;
+        the_one = m_bmpDisabled;

     else if (m_isSelected)
     else if (m_isSelected)

-        the_one = m_selected;
+        the_one = m_bmpSelected;

     else if (m_hasFocus)
     else if (m_hasFocus)

-        the_one = m_focus;
+        the_one = m_bmpFocus;

     else
     {
         if (m_isSelected)
     else
     {
         if (m_isSelected)


@@ -234,58 +236,27 @@ void wxBitmapButton::SetBitmap()
     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();
 

-    GtkButton *bin = GTK_BUTTON(m_widget);
-    if (bin->child == NULL)
-    {          // initial bitmap
+    GtkWidget *child = BUTTON_CHILD(m_widget);
+    if (child == NULL)
+    {
+        // initial bitmap

         GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
         GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);

-    } 
-    else 
+    }
+    else

     {   // subsequent bitmaps
     {   // subsequent bitmaps

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

         gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
     }
 }
 
         gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
     }
 }
 

-void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )
-{
-    if (!bitmap.Ok()) return;
-    m_disabled = bitmap;
-
-    SetBitmap();
-}
-
-void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )
-{
-    if (!bitmap.Ok()) return;
-    m_focus = bitmap;
-
-    SetBitmap();
-}
-
-void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
-{
-    if (!bitmap.Ok()) return;
-    m_bitmap = bitmap;
-
-    SetBitmap();
-}
-
-void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
-{
-    if (!bitmap.Ok()) return;
-    m_selected = bitmap;
-
-    SetBitmap();
-}
-

 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 

-    SetBitmap();
+    OnSetBitmap();

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -293,25 +264,25 @@ 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 // wxUSE_BMPBUTTON
 }
 
 #endif // wxUSE_BMPBUTTON