Add combo sample to compile list of OpenVMS

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 8fb62fc085dd6420cb018d34f7b840e1770bbd83..a814ea7a317838d0057c72c6fc352753eba88be7 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,16 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bmpbuttn.h"
-#endif
-
-#include "wx/bmpbuttn.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

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

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


@@ -41,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)


@@ -51,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;


@@ -65,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;


@@ -77,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;


@@ -89,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;


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

+}

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


@@ -108,50 +116,44 @@ 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_marginX =
-    m_marginY = 0;
+    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_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;
-        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;
-        SetSize( newSize.x, newSize.y );
-        SetBitmap();
+        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",


@@ -165,21 +167,9 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
+    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 )


@@ -189,119 +179,89 @@ void wxBitmapButton::SetLabel( const wxString &label )
     wxControl::SetLabel( label );
 }
 
     wxControl::SetLabel( label );
 }
 

-wxString wxBitmapButton::GetLabel() const
+void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
+    if ( !BUTTON_CHILD(m_widget) )
+        return;

 
 

-    return wxControl::GetLabel();
+    wxButton::DoApplyWidgetStyle(style);

 }
 
 }
 

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

 {
 {

-    if (GTK_BUTTON(m_widget)->child == NULL) return;
-    
-    wxButton::ApplyWidgetStyle();
-}
+    wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );

 
 

-void wxBitmapButton::SetBitmap()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+    InvalidateBestSize();

 
     wxBitmap the_one;
 
     wxBitmap the_one;

-    if (!m_isEnabled)
-        the_one = m_disabled;
+    if (!IsThisEnabled())
+        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
     else

-        the_one = m_bitmap;
+        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;
 
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
     if (!the_one.Ok()) return;
 
     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 *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
+    GtkWidget *child = BUTTON_CHILD(m_widget);
+    if (child == NULL)
+    {
+        // initial bitmap
+        GtkWidget *pixmap;
+        pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);

         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
         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);
-        gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
+        GtkPixmap *pixmap = GTK_PIXMAP(child);
+        gtk_pixmap_set(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 )
+wxSize wxBitmapButton::DoGetBestSize() const

 {
 {

-    if (!bitmap.Ok()) return;
-    m_bitmap = bitmap;
-
-    SetBitmap();
-}
-
-void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
-{
-    if (!bitmap.Ok()) return;
-    m_selected = bitmap;
-
-    SetBitmap();
+    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;

 
 

-    SetBitmap();
+    OnSetBitmap();

 
 

-    return TRUE;
+    return true;

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

-    m_hasFocus = TRUE;
-    SetBitmap();
+    m_hasFocus = true;
+    OnSetBitmap();

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

-    m_hasFocus = FALSE;
-    SetBitmap();
+    m_hasFocus = false;
+    OnSetBitmap();

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

-    m_isSelected = TRUE;
-    SetBitmap();
+    m_isSelected = true;
+    OnSetBitmap();

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

-    m_isSelected = FALSE;
-    SetBitmap();
+    m_isSelected = false;
+    OnSetBitmap();

 }
 
 #endif // wxUSE_BMPBUTTON
 }
 
 #endif // wxUSE_BMPBUTTON

-