wxMessageBox off the main thread lost result code.

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

diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp
index d8696cb8a5c678b61120218a0b7a2ec1a1a6e62e..7e7be28ff9ed22db43365c654cd3642e250d11ed 100644 (file)
--- a/src/gtk1/tglbtn.cpp
+++ b/src/gtk1/tglbtn.cpp
@@ -1,22 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk1/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
 // Modified by:
 // Created:     08.02.01
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Johnny C. Norris II
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // 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/gtk1/private.h"
 
 
 #include "wx/gtk1/private.h"
 


@@ -37,14 +39,14 @@ static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxTog
     if (cb->m_blockEvent) return;
 
     // Generate a wx event.
     if (cb->m_blockEvent) return;
 
     // Generate a wx event.

-    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
+    wxCommandEvent event(wxEVT_TOGGLEBUTTON, cb->GetId());

     event.SetInt(cb->GetValue());
     event.SetEventObject(cb);
     event.SetInt(cb->GetValue());
     event.SetEventObject(cb);

-    cb->GetEventHandler()->ProcessEvent(event);
+    cb->HandleWindowEvent(event);

 }
 }
 
 }
 }
 

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

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


@@ -78,7 +80,7 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
     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 );
 

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
         OnSetBitmap();
     }
     {
         OnSetBitmap();
     }


@@ -131,9 +133,9 @@ void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
 
 void wxToggleBitmapButton::OnSetBitmap()
 {
 
 void wxToggleBitmapButton::OnSetBitmap()
 {

-    if (!m_bitmap.Ok()) return;
+    if (!m_bitmap.IsOk()) 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);


@@ -176,11 +178,11 @@ void wxToggleBitmapButton::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 
 {
     wxCursor cursor = m_cursor;
 

-    if (g_globalCursor.Ok())
+    if (g_globalCursor.IsOk())

         cursor = g_globalCursor;
 
     GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
         cursor = g_globalCursor;
 
     GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);

-    if ( win && cursor.Ok() )
+    if ( win && cursor.IsOk() )

     {
       /* I now set the cursor the anew in every OnInternalIdle call
          as setting the cursor in a parent window also effects the
     {
       /* I now set the cursor the anew in every OnInternalIdle call
          as setting the cursor in a parent window also effects the


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

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;
         best.x = m_bitmap.GetWidth()+border;
     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;
         best.x = m_bitmap.GetWidth()+border;


@@ -317,11 +319,11 @@ void wxToggleButton::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 
 {
     wxCursor cursor = m_cursor;
 

-    if (g_globalCursor.Ok())
+    if (g_globalCursor.IsOk())

         cursor = g_globalCursor;
 
     GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
         cursor = g_globalCursor;
 
     GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);

-    if ( win && cursor.Ok() )
+    if ( win && cursor.IsOk() )

     {
       /* I now set the cursor the anew in every OnInternalIdle call
          as setting the cursor in a parent window also effects the
     {
       /* I now set the cursor the anew in every OnInternalIdle call
          as setting the cursor in a parent window also effects the


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

-