Initialized m_startint in the constructor to avoid cloning of uninitialized value

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

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

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,12 +13,24 @@
 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

+#if wxUSE_BMPBUTTON
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+

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

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

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


@@ -27,100 +38,270 @@ class wxBitmapButton;
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------

-// wxBitmapButton
+// "clicked"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
-

 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"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-wxBitmapButton::wxBitmapButton(void)
+static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )

 {
 {

+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->HasFocus();

 }
 
 }
 

-bool wxBitmapButton::Create(  wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxValidator& validator, const wxString &name )
+//-----------------------------------------------------------------------------
+// "leave"
+//-----------------------------------------------------------------------------
+
+static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )

 {
 {

-  m_needParent = TRUE;
-  
-  wxSize newSize = size;
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;

 
 

-  PreCreation( parent, id, pos, newSize, style, name );
-  
-  SetValidator( validator );
+    button->NotFocus();
+}

 
 

-  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();
-  
-  Show( TRUE );
-    
-  return TRUE;
+//-----------------------------------------------------------------------------
+// "pressed"
+//-----------------------------------------------------------------------------
+
+static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+{
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->StartSelect();
+}
+
+//-----------------------------------------------------------------------------
+// "released"
+//-----------------------------------------------------------------------------
+
+static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+{
+    if (!button->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    button->EndSelect();
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
+
+wxBitmapButton::wxBitmapButton()
+{
+}
+
+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;
+
+    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_disabled = bitmap;
+    m_focus    = bitmap;
+    m_selected = bitmap;
+
+    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_bitmap.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();
+    }
+
+    gtk_signal_connect( 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();
+
+    SetBackgroundColour( parent->GetBackgroundColour() );
+
+    Show( TRUE );
+
+    return TRUE;

 }
 }

-      
-void wxBitmapButton::SetDefault(void)
+
+void wxBitmapButton::SetDefault()

 {
 {

-/*
-  GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
-  gtk_widget_grab_default( m_widget );
-*/
+    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 )
 {

-  wxControl::SetLabel( label );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+
+    wxControl::SetLabel( label );
+}
+
+wxString wxBitmapButton::GetLabel() const
+{
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
+
+    return wxControl::GetLabel();
+}
+
+void wxBitmapButton::ApplyWidgetStyle()
+{
+    if (GTK_BUTTON(m_widget)->child == NULL) return;
+    
+    wxButton::ApplyWidgetStyle();
+}
+
+void wxBitmapButton::SetBitmap()
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
+
+    wxBitmap the_one;
+    if (!m_isEnabled)
+        the_one = m_disabled;
+    else if (m_isSelected)
+        the_one = m_selected;
+    else if (m_hasFocus)
+        the_one = m_focus;
+    else
+        the_one = m_bitmap;
+
+    if (!the_one.Ok()) the_one = m_bitmap;
+    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);
+        gtk_widget_show(pixmap);
+        gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
+    } 
+    else 
+    {   // subsequent bitmaps
+        GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child);
+        gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
+    }
+}
+
+void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )
+{
+    if (!bitmap.Ok()) return;
+    m_disabled = bitmap;
+
+    SetBitmap();

 }
 
 }
 

-wxString wxBitmapButton::GetLabel(void) const
+void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )

 {
 {

-  return wxControl::GetLabel();
+    if (!bitmap.Ok()) return;
+    m_focus = bitmap;
+
+    SetBitmap();

 }
 
 void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {
 }
 
 void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {

-  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 );
+    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;
+
+    SetBitmap();
+
+    return TRUE;
+}
+
+void wxBitmapButton::HasFocus()
+{
+    m_hasFocus = TRUE;
+    SetBitmap();
+}
+
+void wxBitmapButton::NotFocus()
+{
+    m_hasFocus = FALSE;
+    SetBitmap();
+}
+
+void wxBitmapButton::StartSelect()
+{
+    m_isSelected = TRUE;
+    SetBitmap();
+}
+
+void wxBitmapButton::EndSelect()
+{
+    m_isSelected = FALSE;
+    SetBitmap();
+}

 
 

+#endif // wxUSE_BMPBUTTON