Committing in .

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

diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp
index 8ac7ec5a3c6364728ce0f8ed57194b0976e3f193..cf8a289b9e722b95a4bb249fcf013d460614d6de 100644 (file)
--- a/src/gtk1/tglbtn.cpp
+++ b/src/gtk1/tglbtn.cpp
@@ -7,7 +7,7 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     Rocketeer license
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -24,23 +24,24 @@ extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;

-extern wxWindowGTK *g_delayedFocus;

 
 

+extern "C" {

 static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
 {
 static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
 {

-   if (g_isIdle)
-      wxapp_install_idle_handler();
-
-   if (!cb->m_hasVMT || g_blockEventsOnDrag)
-      return;
-      
-   if (cb->m_blockEvent) return;
-
-   // Generate a wx event.
-   wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
-   event.SetInt(cb->GetValue());
-   event.SetEventObject(cb);
-   cb->GetEventHandler()->ProcessEvent(event);
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!cb->m_hasVMT || g_blockEventsOnDrag)
+        return;
+
+    if (cb->m_blockEvent) return;
+
+    // Generate a wx event.
+    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
+    event.SetInt(cb->GetValue());
+    event.SetEventObject(cb);
+    cb->GetEventHandler()->ProcessEvent(event);
+}

 }
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 }
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)


@@ -57,18 +58,18 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
                             const wxValidator& validator,
                             const wxString &name)
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-   
-    m_blockEvent = FALSE;
+    m_needParent = true;
+    m_acceptsFocus = true;
+
+    m_blockEvent = false;

 
     if (!PreCreation(parent, pos, size) ||
        !CreateBase(parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));
 
     if (!PreCreation(parent, pos, size) ||
        !CreateBase(parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));

-        return FALSE;
+        return false;

     }
     }

-    
+

     m_bitmap = label;
 
     // Create the gtk widget.
     m_bitmap = label;
 
     // Create the gtk widget.


@@ -90,32 +91,32 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
 
     PostCreation(size);
 

-    return TRUE;
+    return true;

 }
 
 // void SetValue(bool state)
 // Set the value of the toggle button.
 void wxToggleBitmapButton::SetValue(bool state)
 {
 }
 
 // void SetValue(bool state)
 // Set the value of the toggle button.
 void wxToggleBitmapButton::SetValue(bool state)
 {

-   wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+    wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));

 
 

-   if (state == GetValue())
-      return;
+    if (state == GetValue())
+        return;

 
 

-   m_blockEvent = TRUE;
+    m_blockEvent = true;

 
 

-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);

 
 

-   m_blockEvent = FALSE;
+    m_blockEvent = false;

 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleBitmapButton::GetValue() const
 {
 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleBitmapButton::GetValue() const
 {

-   wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));

 
 

-   return GTK_TOGGLE_BUTTON(m_widget)->active;
+    return GTK_TOGGLE_BUTTON(m_widget)->active;

 }
 
 void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
 }
 
 void wxToggleBitmapButton::SetLabel(const wxBitmap& label)


@@ -123,7 +124,8 @@ void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 
     m_bitmap = label;
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 
     m_bitmap = label;

-    
+    InvalidateBestSize();
+

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 


@@ -149,14 +151,14 @@ void wxToggleBitmapButton::OnSetBitmap()
     }
 }
 
     }
 }
 

-bool wxToggleBitmapButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleBitmapButton::Enable(bool enable /*=true*/)

 {
     if (!wxControl::Enable(enable))
 {
     if (!wxControl::Enable(enable))

-        return FALSE;
+        return false;

 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 

-    return TRUE;
+    return true;

 }
 
 void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
 }
 
 void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)


@@ -173,7 +175,7 @@ bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
 void wxToggleBitmapButton::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 void wxToggleBitmapButton::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;

-    
+

     if (g_globalCursor.Ok())
         cursor = g_globalCursor;
 
     if (g_globalCursor.Ok())
         cursor = g_globalCursor;
 


@@ -192,18 +194,19 @@ void wxToggleBitmapButton::OnInternalIdle()
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 

-// wxSize DoGetBestSize() const
+

 // Get the "best" size for this control.
 wxSize wxToggleBitmapButton::DoGetBestSize() const
 {
     wxSize best;
 // Get the "best" size for this control.
 wxSize wxToggleBitmapButton::DoGetBestSize() const
 {
     wxSize best;

-    
+

     if (m_bitmap.Ok())
     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;
         best.x = m_bitmap.GetWidth()+border;
         best.y = m_bitmap.GetHeight()+border;
     }
     if (m_bitmap.Ok())
     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;
         best.x = m_bitmap.GetWidth()+border;
         best.y = m_bitmap.GetHeight()+border;
     }

+    CacheBestSize(best);

     return best;
 }
 
     return best;
 }
 


@@ -228,56 +231,56 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
                             const wxValidator& validator,
                             const wxString &name)
 {

-   m_needParent = TRUE;
-   m_acceptsFocus = TRUE;
-   
-   m_blockEvent = FALSE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
 

-   if (!PreCreation(parent, pos, size) ||
-       !CreateBase(parent, id, pos, size, style, validator, name )) {
-      wxFAIL_MSG(wxT("wxToggleButton creation failed"));
-      return FALSE;
-   }
+    m_blockEvent = false;

 
 

-   wxControl::SetLabel(label);
+    if (!PreCreation(parent, pos, size) ||
+        !CreateBase(parent, id, pos, size, style, validator, name )) {
+        wxFAIL_MSG(wxT("wxToggleButton creation failed"));
+        return false;
+    }

 
 

-   // Create the gtk widget.
-   m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+    wxControl::SetLabel(label);

 
 

-   gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
-                      GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
-                      (gpointer *)this);
+    // Create the gtk widget.
+    m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+
+    gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
+                       GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
+                       (gpointer *)this);

 
 

-   m_parent->DoAddChild(this);
+    m_parent->DoAddChild(this);

 
 

-   PostCreation(size);
+    PostCreation(size);

 
 

-   return TRUE;
+    return true;

 }
 
 // void SetValue(bool state)
 // Set the value of the toggle button.
 void wxToggleButton::SetValue(bool state)
 {
 }
 
 // void SetValue(bool state)
 // Set the value of the toggle button.
 void wxToggleButton::SetValue(bool state)
 {

-   wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+    wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));

 
 

-   if (state == GetValue())
-      return;
+    if (state == GetValue())
+        return;

 
 

-   m_blockEvent = TRUE;
+    m_blockEvent = true;

 
 

-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);

 
 

-   m_blockEvent = FALSE;
+    m_blockEvent = false;

 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleButton::GetValue() const
 {
 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleButton::GetValue() const
 {

-   wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));

 
 

-   return GTK_TOGGLE_BUTTON(m_widget)->active;
+    return GTK_TOGGLE_BUTTON(m_widget)->active;

 }
 
 void wxToggleButton::SetLabel(const wxString& label)
 }
 
 void wxToggleButton::SetLabel(const wxString& label)


@@ -289,14 +292,14 @@ void wxToggleButton::SetLabel(const wxString& label)
     gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
 }
 
     gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
 }
 

-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleButton::Enable(bool enable /*=true*/)

 {
     if (!wxControl::Enable(enable))
 {
     if (!wxControl::Enable(enable))

-        return FALSE;
+        return false;

 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 

-    return TRUE;
+    return true;

 }
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
 }
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)


@@ -313,7 +316,7 @@ bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
 void wxToggleButton::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 void wxToggleButton::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;

-    
+

     if (g_globalCursor.Ok())
         cursor = g_globalCursor;
 
     if (g_globalCursor.Ok())
         cursor = g_globalCursor;
 


@@ -332,19 +335,19 @@ void wxToggleButton::OnInternalIdle()
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 

-// wxSize DoGetBestSize() const
+

 // Get the "best" size for this control.
 wxSize wxToggleButton::DoGetBestSize() const
 {
     wxSize ret(wxControl::DoGetBestSize());
 // Get the "best" size for this control.
 wxSize wxToggleButton::DoGetBestSize() const
 {
     wxSize ret(wxControl::DoGetBestSize());

-   
+

     if (!HasFlag(wxBU_EXACTFIT))
     {
         if (ret.x < 80) ret.x = 80;
     }
     if (!HasFlag(wxBU_EXACTFIT))
     {
         if (ret.x < 80) ret.x = 80;
     }

-    

 
 

-   return ret;
+    CacheBestSize(ret);
+    return ret;

 }
 
 // static
 }
 
 // static