[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 71c35e39ca8b7d514149dad47e5bd746ddc52af3..b3091ddaa86eff1d02f06d1b78116a78228391f1 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -1,24 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 

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

 #include "wx/bmpbuttn.h"
 
 #include "wx/bmpbuttn.h"
 

+#include "wx/gtk/private.h"
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxBitmapButton;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxBitmapButton;
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -29,104 +45,260 @@ 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 (!button->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
-  event.SetEventObject(button);
-  button->GetEventHandler()->ProcessEvent(event);
+    if (g_isIdle)
+        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);
+}
+}
+
+//-----------------------------------------------------------------------------
+// "enter"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+{
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->HasFocus();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "leave"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+{
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->NotFocus();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "pressed"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+{
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->StartSelect();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "released"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+{
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->EndSelect();
+}

 }
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)

 
 

-wxBitmapButton::wxBitmapButton(void)
+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;
-  
-  wxSize newSize = size;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
 

-  PreCreation( parent, id, pos, newSize, style, name );
-  
-  SetValidator( validator );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
+        return false;
+    }

 
 

-  m_bitmap = bitmap;
-  m_label = "";
-  
-  m_widget = gtk_button_new();
-  
-  if (m_bitmap.Ok())
-  {
-    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 );
-  }
-  
-  if (newSize.x == -1) newSize.x = m_bitmap.GetHeight()+10;
-  if (newSize.y == -1) newSize.y = m_bitmap.GetWidth()+10;
-  SetSize( newSize.x, newSize.y );
-  
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
-
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-
-  Show( TRUE );
-    
-  return TRUE;
-}
-      
-void wxBitmapButton::SetDefault(void)
-{
-/*
-  GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
-  gtk_widget_grab_default( m_widget );
-*/
+    m_bmpNormal = bitmap;
+
+    m_widget = gtk_button_new();
+
+    if (style & wxNO_BORDER)
+       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
+
+    if (m_bmpNormal.Ok())
+    {
+        OnSetBitmap();
+    }
+
+    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_enter_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "leave",
+      GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed",
+      GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), "released",
+      GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
+
+    m_parent->DoAddChild( this );
+
+    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 );

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

-  wxCHECK_RET( m_widget != NULL, "invalid button" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+
+    wxControl::SetLabel( label );
+}
+
+wxString wxBitmapButton::GetLabel() const
+{
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") );
+
+    return wxControl::GetLabel();
+}
+
+void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    if ( !BUTTON_CHILD(m_widget) )
+        return;
+
+    wxButton::DoApplyWidgetStyle(style);
+}
+
+void wxBitmapButton::OnSetBitmap()
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
+
+    InvalidateBestSize();
+
+    wxBitmap the_one;
+    if (!m_isEnabled)
+        the_one = m_bmpDisabled;
+    else 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_bmpNormal;
+    if (!the_one.Ok()) return;
+
+    GdkBitmap *mask = (GdkBitmap *) NULL;
+    if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
+
+    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
+    }
+}
+
+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
+bool wxBitmapButton::Enable( bool enable )
+{
+    if ( !wxWindow::Enable(enable) )
+        return false;
+
+    OnSetBitmap();

 
 

-  wxControl::SetLabel( label );
+    return true;

 }
 
 }
 

-wxString wxBitmapButton::GetLabel(void) const
+void wxBitmapButton::HasFocus()

 {
 {

-  wxCHECK_MSG( m_widget != NULL, "", "invalid button" );
+    m_hasFocus = true;
+    OnSetBitmap();
+}

 
 

-  return wxControl::GetLabel();
+void wxBitmapButton::NotFocus()
+{
+    m_hasFocus = false;
+    OnSetBitmap();

 }
 
 }
 

-void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
+void wxBitmapButton::StartSelect()

 {
 {

-  wxCHECK_RET( m_widget != NULL, "invalid button" );
+    m_isSelected = true;
+    OnSetBitmap();
+}

 
 

-  m_bitmap = bitmap;
-  if (!m_bitmap.Ok()) return;
-  
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
-  
-  GdkBitmap *mask = (GdkBitmap *) NULL;
-  if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-  
-  gtk_pixmap_set( g_pixmap, m_bitmap.GetPixmap(), mask );
+void wxBitmapButton::EndSelect()
+{
+    m_isSelected = false;
+    OnSetBitmap();

 }
 
 }
 

+#endif // wxUSE_BMPBUTTON
+