better ownership handling

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

diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp
index a4f9d6da9e4c3483bc2ac00c542c01446438418d..286f3fc4782ae73251db3ccecb25c9dc0d9303ae 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:     wxWindows licence
+// Licence:     wxWindows licence

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


@@ -47,7 +47,7 @@ static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxTog
 }
 }
 
 }
 }
 

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

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


@@ -81,7 +81,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();
     }


@@ -134,9 +134,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);


@@ -179,11 +179,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


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


@@ -320,11 +320,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