Fix deprecating warning introduced in r72446.

[wxWidgets.git] / src / gtk / control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index f69a1dddf326115c530353c81973ee9ce9e0debe..40c21e9e15cd225caaed051db60b96fb080127d6 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -20,10 +20,11 @@
 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

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

 #include "wx/utils.h"
 #include "wx/sysopt.h"
 
 #include "wx/utils.h"
 #include "wx/sysopt.h"
 

+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 #include "wx/gtk/private/mnemonics.h"
 
 // ============================================================================
 #include "wx/gtk/private/mnemonics.h"
 
 // ============================================================================


@@ -57,6 +58,21 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 

+#ifdef __WXGTK3__
+bool wxControl::SetFont(const wxFont& font)
+{
+    const bool changed = base_type::SetFont(font);
+    if (changed && !gtk_widget_get_realized(m_widget))
+    {
+        // GTK defers sending "style-updated" until widget is realized, but
+        // GetBestSize() won't compute correct result until the signal is sent,
+        // so we have to do it now
+        g_signal_emit_by_name(m_widget, "style-updated");
+    }
+    return changed;
+}
+#endif
+

 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...


@@ -71,7 +87,20 @@ wxSize wxControl::DoGetBestSize() const
     else
     {
         GtkRequisition req;
     else
     {
         GtkRequisition req;

+#ifdef __WXGTK3__
+        if (gtk_widget_get_request_mode(m_widget) != GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
+        {
+            gtk_widget_get_preferred_height(m_widget, NULL, &req.height);
+            gtk_widget_get_preferred_width_for_height(m_widget, req.height, NULL, &req.width);
+        }
+        else
+        {
+            gtk_widget_get_preferred_width(m_widget, NULL, &req.width);
+            gtk_widget_get_preferred_height_for_width(m_widget, req.width, NULL, &req.height);
+        }
+#else

         GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req);
         GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req);

+#endif

         best.Set(req.width, req.height);
     }
     CacheBestSize(best);
         best.Set(req.width, req.height);
     }
     CacheBestSize(best);


@@ -82,14 +111,16 @@ void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();
 
 {
     wxWindow::PostCreation();
 

+#ifndef __WXGTK3__

     // NB: GetBestSize needs to know the style, otherwise it will assume
     //     default font and if the user uses a different font, determined
     //     best size will be different (typically, smaller) than the desired
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
     // NB: GetBestSize needs to know the style, otherwise it will assume
     //     default font and if the user uses a different font, determined
     //     best size will be different (typically, smaller) than the desired
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);

+#endif

 
 

-    ApplyWidgetStyle();
+    GTKApplyWidgetStyle();

     SetInitialSize(size);
 }
 
     SetInitialSize(size);
 }
 


@@ -99,8 +130,9 @@ void wxControl::PostCreation(const wxSize& size)
 // ----------------------------------------------------------------------------
 
 // Fix sensitivity due to bug in GTK+ < 2.14
 // ----------------------------------------------------------------------------
 
 // Fix sensitivity due to bug in GTK+ < 2.14

-void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse)
+void wxControl::GTKFixSensitivity(bool WXUNUSED_IN_GTK3(onlyIfUnderMouse))

 {
 {

+#ifndef __WXGTK3__

     if (gtk_check_version(2,14,0)
 #if wxUSE_SYSTEM_OPTIONS
         && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1)
     if (gtk_check_version(2,14,0)
 #if wxUSE_SYSTEM_OPTIONS
         && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1)


@@ -115,6 +147,7 @@ void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse)
             Show();
         }
     }
             Show();
         }
     }

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -123,19 +156,19 @@ void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse)
 
 void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
 {
 
 void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
 {

-    // save the original label
-    wxControlBase::SetLabel(label);
-

     const wxString labelGTK = GTKConvertMnemonics(label);
     gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
 }
 
     const wxString labelGTK = GTKConvertMnemonics(label);
     gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
 }
 

+#if wxUSE_MARKUP
+

 void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label)
 {
     const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label);
     gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK));
 }
 
 void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label)
 {
     const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label);
     gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK));
 }
 

+#endif // wxUSE_MARKUP

 
 // ----------------------------------------------------------------------------
 // GtkFrame helpers
 
 // ----------------------------------------------------------------------------
 // GtkFrame helpers


@@ -160,14 +193,16 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label)
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 {
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 {

+    wxControlBase::SetLabel(label);
+

     GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
     GTKSetLabelForLabel(labelwidget, label);
 }
 
 void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style)
 {
     GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
     GTKSetLabelForLabel(labelwidget, label);
 }
 
 void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style)
 {

-    gtk_widget_modify_style(GTK_WIDGET(w), style);
-    gtk_widget_modify_style(gtk_frame_get_label_widget (w), style);
+    GTKApplyStyle(GTK_WIDGET(w), style);
+    GTKApplyStyle(gtk_frame_get_label_widget(w), style);

 }
 
 void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget)
 }
 
 void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget)


@@ -212,11 +247,29 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,

-                                             bool useBase,
+                                             bool WXUNUSED_IN_GTK3(useBase),

                                              int state)
 {
                                              int state)
 {

-    GtkStyle* style;

     wxVisualAttributes attr;
     wxVisualAttributes attr;

+#ifdef __WXGTK3__
+    GtkStateFlags stateFlag = GTK_STATE_FLAG_NORMAL;
+    if (state)
+    {
+        wxASSERT(state == GTK_STATE_ACTIVE);
+        stateFlag = GTK_STATE_FLAG_ACTIVE;
+    }
+    GtkStyleContext* sc = gtk_widget_get_style_context(widget);
+    GdkRGBA c;
+    gtk_style_context_get_color(sc, stateFlag, &c);
+    attr.colFg = wxColour(c);
+    gtk_style_context_get_background_color(sc, stateFlag, &c);
+    attr.colBg = wxColour(c);
+    wxNativeFontInfo info;
+    info.description = const_cast<PangoFontDescription*>(gtk_style_context_get_font(sc, stateFlag));
+    attr.font = wxFont(info);
+    info.description = NULL;
+#else
+    GtkStyle* style;

 
     style = gtk_rc_get_style(widget);
     if (!style)
 
     style = gtk_rc_get_style(widget);
     if (!style)


@@ -227,9 +280,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
         return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL);
     }
 
         return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL);
     }
 

-    if (state == -1)
-        state = GTK_STATE_NORMAL;
-

     // get the style's colours
     attr.colFg = wxColour(style->fg[state]);
     if (useBase)
     // get the style's colours
     attr.colFg = wxColour(style->fg[state]);
     if (useBase)


@@ -243,10 +293,12 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
     if ( style && style->font_desc )
     {
         wxNativeFontInfo info;
     if ( style && style->font_desc )
     {
         wxNativeFontInfo info;

-        info.description = pango_font_description_copy(style->font_desc);
+        info.description = style->font_desc;

         attr.font = wxFont(info);
         attr.font = wxFont(info);

+        info.description = NULL;

     }
     }

-    else
+#endif
+    if (!attr.font.IsOk())

     {
         GtkSettings *settings = gtk_settings_get_default();
         gchar *font_name = NULL;
     {
         GtkSettings *settings = gtk_settings_get_default();
         gchar *font_name = NULL;


@@ -314,22 +366,4 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
     return attr;
 }
 
     return attr;
 }
 

-// ----------------------------------------------------------------------------
-// idle handling
-// ----------------------------------------------------------------------------
-
-void wxControl::OnInternalIdle()
-{
-    if ( GTKShowFromOnIdle() )
-        return;
-
-    if ( GTK_WIDGET_REALIZED(m_widget) )
-    {
-        GTKUpdateCursor();
-    }
-
-    if ( wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen() )
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-

 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS