X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ab696e0a990089c26e597fe4510fa43812b998e..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/gtk/tglbtn.cpp?ds=sidebyside

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index b3b2ec9ef3..d6f4d5881f 100644
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -10,21 +10,22 @@
 // License:     Rocketeer license
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/tglbtn.h"
 #include "wx/button.h"
 
 #if wxUSE_TOGGLEBTN
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
+extern wxWindowGTK *g_delayedFocus;
 
-// void gtk_togglebutton_clicked_callback(GtkWidget *widget, wxToggleButton *cb)
-// Callback function given to gtk.
 static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
 {
    if (g_isIdle)
@@ -65,7 +66,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
    wxControl::SetLabel(label);
 
    // Create the gtk widget.
-   m_widget = gtk_toggle_button_new_with_label(m_label.mbc_str());
+   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),
@@ -74,8 +75,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
    m_parent->DoAddChild(this);
 
    PostCreation();
-
-   SetFont(parent->GetFont());
+   InheritAttributes();
 
    wxSize size_best(DoGetBestSize());
    wxSize new_size(size);
@@ -86,9 +86,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
    if ((new_size.x != size.x) || (new_size.y != size.y))
       SetSize(new_size.x, new_size.y);
 
-   SetBackgroundColour(parent->GetBackgroundColour());
-   SetForegroundColour(parent->GetForegroundColour());
-
    Show(TRUE);
 
    return TRUE;
@@ -125,8 +122,7 @@ void wxToggleButton::SetLabel(const wxString& label)
 
     wxControl::SetLabel(label);
 
-    gtk_label_set(GTK_LABEL(GTK_BUTTON(m_widget)->child),
-                 GetLabel().mbc_str());
+    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
 }
 
 bool wxToggleButton::Enable(bool enable /*=TRUE*/)
@@ -134,7 +130,7 @@ bool wxToggleButton::Enable(bool enable /*=TRUE*/)
     if (!wxControl::Enable(enable))
         return FALSE;
 
-    gtk_widget_set_sensitive(GTK_BUTTON(m_widget)->child, enable);
+    gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
     return TRUE;
 }
@@ -143,12 +139,12 @@ void wxToggleButton::ApplyWidgetStyle()
 {
     SetWidgetStyle();
     gtk_widget_set_style(m_widget, m_widgetStyle);
-    gtk_widget_set_style(GTK_BUTTON(m_widget)->child, m_widgetStyle);
+    gtk_widget_set_style(BUTTON_CHILD(m_widget), m_widgetStyle);
 }
 
 bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
 {
-    return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
 }
 
 void wxToggleButton::OnInternalIdle()
@@ -158,17 +154,19 @@ void wxToggleButton::OnInternalIdle()
     if (g_globalCursor.Ok())
         cursor = g_globalCursor;
 
-    if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok()) {
+    GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
+    if ( win && 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. */
 
-        gdk_window_set_cursor(GTK_TOGGLE_BUTTON(m_widget)->event_window,
-                            cursor.GetCursor());
+        gdk_window_set_cursor(win, cursor.GetCursor());
     }
 
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 // wxSize DoGetBestSize() const