No real changes, just minor cleanup in wxGTK wxDVC.

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

diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp
index 1bf01efef71d7fc91f9d83236dab0405316f7971..517b143547ef44249da70be979f485f532420e66 100644 (file)
--- a/src/gtk1/tglbtn.cpp
+++ b/src/gtk1/tglbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/tglbtn.cpp
+// Name:        src/gtk1/tglbtn.cpp

 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter


@@ -13,39 +13,41 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_TOGGLEBTN
+

 #include "wx/tglbtn.h"
 #include "wx/tglbtn.h"

-#include "wx/button.h"

 
 

-#if wxUSE_TOGGLEBTN
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif

 
 

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

 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 
 extern void wxapp_install_idle_handler();
 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)
 {
 
 extern "C" {
 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->HandleWindowEvent(event);

 }
 }
 
 }
 }
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );

 
 // ------------------------------------------------------------------------
 // wxToggleBitmapButton
 
 // ------------------------------------------------------------------------
 // wxToggleBitmapButton


@@ -59,18 +61,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.


@@ -92,32 +94,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)


@@ -126,7 +128,7 @@ void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
 
     m_bitmap = label;
     InvalidateBestSize();
 
     m_bitmap = label;
     InvalidateBestSize();

-    
+

     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 


@@ -134,7 +136,7 @@ void wxToggleBitmapButton::OnSetBitmap()
 {
     if (!m_bitmap.Ok()) return;
 
 {
     if (!m_bitmap.Ok()) return;
 

-    GdkBitmap *mask = (GdkBitmap *) NULL;
+    GdkBitmap *mask = NULL;

     if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
 
     GtkWidget *child = BUTTON_CHILD(m_widget);
     if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
 
     GtkWidget *child = BUTTON_CHILD(m_widget);


@@ -152,14 +154,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)


@@ -176,7 +178,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;
 


@@ -200,7 +202,7 @@ void wxToggleBitmapButton::OnInternalIdle()
 wxSize wxToggleBitmapButton::DoGetBestSize() const
 {
     wxSize best;
 wxSize wxToggleBitmapButton::DoGetBestSize() const
 {
     wxSize best;

-    
+

     if (m_bitmap.Ok())
     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;
     if (m_bitmap.Ok())
     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;


@@ -232,56 +234,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 ) );

 
 

-   m_parent->DoAddChild(this);
+    gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
+                       GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
+                       (gpointer *)this);

 
 

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

 
 

-   return TRUE;
+    PostCreation(size);
+
+    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)


@@ -293,14 +295,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)


@@ -317,7 +319,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;
 


@@ -341,12 +343,12 @@ void wxToggleButton::OnInternalIdle()
 wxSize wxToggleButton::DoGetBestSize() const
 {
     wxSize ret(wxControl::DoGetBestSize());
 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;
     }

-    
+

     CacheBestSize(ret);
     return ret;
 }
     CacheBestSize(ret);
     return ret;
 }


@@ -359,4 +361,3 @@ wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_TOGGLEBTN
 }
 
 #endif // wxUSE_TOGGLEBTN

-