Fixing another hard-coded WXDIR path

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

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 060c3a127c38e2296953138510c54f51ed8b7f93..3e3b959f4f5f3e8468a18aa453bb7f0e48cee548 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -106,16 +106,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         m_widget = m_widgetCheckbox;
     }
 
         m_widget = m_widgetCheckbox;
     }
 

-    wxSize newSize(size);
-    if (newSize.x == -1)
-    {
-        newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font,
-                                             m_label.mbc_str() );
-    }
-    if (newSize.y == -1)
-        newSize.y = 26;
-
-    SetSize( newSize.x, newSize.y );
+    SetSizeOrDefault( size );

 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",


@@ -197,17 +188,23 @@ void wxCheckBox::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok())
+    if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && cursor.Ok())

     {
         /* I now set the cursor the anew in every OnInternalIdle call
           as setting the cursor in a parent window also effects the
           windows above so that checking for the current cursor is
           not possible. */
           
     {
         /* I now set the cursor the anew in every OnInternalIdle call
           as setting the cursor in a parent window also effects the
           windows above so that checking for the current cursor is
           not possible. */
           

-       gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() );
+       gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );

     }
 
     UpdateWindowUI();
 }
 
     }
 
     UpdateWindowUI();
 }
 

+wxSize wxCheckBox::DoGetBestSize() const
+{
+    return wxSize( 25 + gdk_string_measure( m_widgetCheckbox->style->font,
+                                            m_label.mbc_str() ), 26 );
+}
+

 #endif
 #endif