Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 921820d4275eab3864061c3473d9279c16a66db0..ff33e9af473f1d14dfd561c06b8d72f3e90f85cf 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -12,11 +12,20 @@
 
 #if wxUSE_CONTROLS
 
 
 #if wxUSE_CONTROLS
 

-#include "wx/log.h"

 #include "wx/control.h"
 #include "wx/control.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/fontutil.h"
 #include "wx/fontutil.h"

-#include "wx/settings.h"
+#include "wx/utils.h"
+#include "wx/sysopt.h"
+
+#include <gtk/gtk.h>

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

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

 
 // ============================================================================
 // wxControl implementation
 
 // ============================================================================
 // wxControl implementation


@@ -30,7 +39,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
 
 wxControl::wxControl()
 {

-    m_needParent = TRUE;

 }
 
 bool wxControl::Create( wxWindow *parent,
 }
 
 bool wxControl::Create( wxWindow *parent,


@@ -50,161 +58,163 @@ 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...
     wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 

-    GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
-        (m_widget, &req );
+    wxSize best;
+    if (m_wxwindow)
+    {
+        // this is not a native control, size_request is likely to be (0,0)
+        best = wxControlBase::DoGetBestSize();
+    }
+    else
+    {
+        best = GTKGetPreferredSize(m_widget);
+    }

 
 

-    wxSize best(req.width, req.height);
-    CacheBestSize(best);

     return best;
 }
 
     return best;
 }
 

-

 void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();
 
 void wxControl::PostCreation(const wxSize& size)
 {
     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();
-    SetInitialBestSize(size);
+    GTKApplyWidgetStyle();
+    SetInitialSize(size);

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

-// wxControl dealing with labels
+// Work around a GTK+ bug whereby button is insensitive after being
+// enabled

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxControl::SetLabel( const wxString &label )
+// Fix sensitivity due to bug in GTK+ < 2.14
+void wxControl::GTKFixSensitivity(bool WXUNUSED_IN_GTK3(onlyIfUnderMouse))

 {
 {

-    // keep the original string internally to be able to return it later (for
-    // consistency with the other ports)
-    m_label = label;
-
-    InvalidateBestSize();
+#ifndef __WXGTK3__
+    if (gtk_check_version(2,14,0)
+#if wxUSE_SYSTEM_OPTIONS
+        && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1)
+#endif
+        )
+    {
+        if (!onlyIfUnderMouse || GetScreenRect().Contains(wxGetMousePosition()))
+        {
+            Hide();
+            Show();
+        }
+    }
+#endif

 }
 
 }
 

-wxString wxControl::GetLabel() const
+// ----------------------------------------------------------------------------
+// wxControl dealing with labels
+// ----------------------------------------------------------------------------
+
+void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)

 {
 {

-    return m_label;
+    const wxString labelGTK = GTKConvertMnemonics(label);
+    gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));

 }
 
 }
 

-void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
+#if wxUSE_MARKUP
+
+void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label)

 {
 {

-    // don't call the virtual function which might call this one back again
-    wxControl::SetLabel(label);
+    const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label);
+    gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK));
+}

 
 

+#endif // wxUSE_MARKUP
+
+// ----------------------------------------------------------------------------
+// GtkFrame helpers
+//
+// GtkFrames do in fact support mnemonics in GTK2+ but not through
+// gtk_frame_set_label, rather you need to use a custom label widget
+// instead (idea gleaned from the native gtk font dialog code in GTK)
+// ----------------------------------------------------------------------------
+
+GtkWidget* wxControl::GTKCreateFrame(const wxString& label)
+{

     const wxString labelGTK = GTKConvertMnemonics(label);
     const wxString labelGTK = GTKConvertMnemonics(label);

+    GtkWidget* labelwidget = gtk_label_new_with_mnemonic(wxGTK_CONV(labelGTK));
+    gtk_widget_show(labelwidget); // without this it won't show...

 
 

-    gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
+    GtkWidget* framewidget = gtk_frame_new(NULL);
+    gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget);
+
+    return framewidget; // note that the label is already set so you'll
+                        // only need to call wxControl::SetLabel afterwards

 }
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 {
 }
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 {

-    wxControl::SetLabel(label);
+    wxControlBase::SetLabel(label);

 
 

-    // frames don't support mnemonics even under GTK+ 2
-    const wxString labelGTK = GTKRemoveMnemonics(label);
-
-    gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL
-                                            : wxGTK_CONV(labelGTK));
+    GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
+    GTKSetLabelForLabel(labelwidget, label);

 }
 
 }
 

-// worker function implementing both GTKConvert/RemoveMnemonics()
-//
-// notice that under GTK+ 1 we only really need to support MNEMONICS_REMOVE as
-// it doesn't support mnemonics anyhow but this would make the code so ugly
-// that we do the same thing for GKT+ 1 and 2
-enum MnemonicsFlag
+void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style)

 {
 {

-    MNEMONICS_REMOVE,
-    MNEMONICS_CONVERT
-};
+    GTKApplyStyle(GTK_WIDGET(w), style);
+    GTKApplyStyle(gtk_frame_get_label_widget(w), style);
+}

 
 

-static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
+void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget)

 {
 {

-    const size_t len = label.length();
-    wxString labelGTK;
-    labelGTK.reserve(len);
-    for ( size_t i = 0; i < len; i++ )
-    {
-        wxChar ch = label[i];
+    GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));

 
 

-        switch ( ch )
-        {
-            case wxT('&'):
-                if ( i == len - 1 )
-                {
-                    // "&" at the end of string is an error
-                    wxLogDebug(wxT("Invalid label \"%s\"."), label.c_str());
-                    break;
-                }
-
-                ch = label[++i]; // skip '&' itself
-                switch ( ch )
-                {
-                    case wxT('&'):
-                        // special case: "&&" is not a mnemonic at all but just
-                        // an escaped "&"
-                        labelGTK += wxT('&');
-                        break;
-
-                    case wxT('_'):
-                        if ( flag == MNEMONICS_CONVERT )
-                        {
-                            // '_' can't be a GTK mnemonic apparently so
-                            // replace it with something similar
-                            labelGTK += wxT("_-");
-                            break;
-                        }
-                        //else: fall through
-
-                    default:
-                        if ( flag == MNEMONICS_CONVERT )
-                            labelGTK += wxT('_');
-                        labelGTK += ch;
-                }
-                break;
-
-            case wxT('_'):
-                if ( flag == MNEMONICS_CONVERT )
-                {
-                    // escape any existing underlines in the string so that
-                    // they don't become mnemonics accidentally
-                    labelGTK += wxT("__");
-                    break;
-                }
-                //else: fall through
-
-            default:
-                labelGTK += ch;
-        }
-    }
-
-    return labelGTK;
+    gtk_label_set_mnemonic_widget(labelwidget, widget);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// worker function implementing GTK*Mnemonics() functions
+// ----------------------------------------------------------------------------
+

 /* static */
 wxString wxControl::GTKRemoveMnemonics(const wxString& label)
 {
 /* static */
 wxString wxControl::GTKRemoveMnemonics(const wxString& label)
 {

-    return GTKProcessMnemonics(label, MNEMONICS_REMOVE);
+    return wxGTKRemoveMnemonics(label);

 }
 
 /* static */
 wxString wxControl::GTKConvertMnemonics(const wxString& label)
 {
 }
 
 /* static */
 wxString wxControl::GTKConvertMnemonics(const wxString& label)
 {

-    return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
+    return wxConvertMnemonicsToGTK(label);
+}
+
+/* static */
+wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label)
+{
+    return wxConvertMnemonicsToGTKMarkup(label);

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


@@ -217,17 +227,32 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
                                              UseGTKStyleBase());
 }
 
                                              UseGTKStyleBase());
 }
 

-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-

 // 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)


@@ -238,21 +263,12 @@ 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
     // get the style's colours

-    attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
-                          style->fg[state].green >> SHIFT,
-                          style->fg[state].blue  >> SHIFT);
+    attr.colFg = wxColour(style->fg[state]);

     if (useBase)
     if (useBase)

-        attr.colBg = wxColour(style->base[state].red   >> SHIFT,
-                              style->base[state].green >> SHIFT,
-                              style->base[state].blue  >> SHIFT);
+        attr.colBg = wxColour(style->base[state]);

     else
     else

-        attr.colBg = wxColour(style->bg[state].red   >> SHIFT,
-                              style->bg[state].green >> SHIFT,
-                              style->bg[state].blue  >> SHIFT);
+        attr.colBg = wxColour(style->bg[state]);

 
     // get the style's font
     if ( !style->font_desc )
 
     // get the style's font
     if ( !style->font_desc )


@@ -260,10 +276,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;


@@ -331,5 +349,58 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
     return attr;
 }
 
     return attr;
 }
 

-#endif // wxUSE_CONTROLS
+// This is not the same as GetBestSize() because that size may have
+// been recalculated and cached by us. We want GTK+ information.
+wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const
+{
+    GtkRequisition req;
+#ifdef __WXGTK3__
+    if (gtk_widget_get_request_mode(widget) != GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
+    {
+        gtk_widget_get_preferred_height(widget, NULL, &req.height);
+        gtk_widget_get_preferred_width_for_height(widget, req.height, NULL, &req.width);
+    }
+    else
+    {
+        gtk_widget_get_preferred_width(widget, NULL, &req.width);
+        gtk_widget_get_preferred_height_for_width(widget, req.width, NULL, &req.height);
+    }
+#else
+    GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req);
+#endif
+
+    return wxSize(req.width, req.height);
+}

 
 

+wxPoint wxControl::GTKGetEntryMargins(GtkEntry* entry) const
+{
+    wxPoint marg(0, 0);
+
+#ifndef __WXGTK3__
+#if GTK_CHECK_VERSION(2,10,0)
+    // The margins we have previously set
+    const GtkBorder* border = gtk_entry_get_inner_border(entry);
+    if ( border )
+    {
+        marg.x = border->left + border->right;
+        marg.y = border->top + border->bottom;
+    }
+#endif // GTK+ 2.10+
+#else // GTK+ 3
+    // Gtk3 does not use inner border, but StyleContext and CSS
+    // TODO: implement it, starting with wxTextEntry::DoSetMargins()
+#endif // GTK+ 2/3
+
+    int x, y;
+    gtk_entry_get_layout_offsets(entry, &x, &y);
+    // inner borders are included. Substract them so we can get other margins
+    x -= marg.x;
+    y -= marg.y;
+    marg.x += 2 * x + 2;
+    marg.y += 2 * y + 2;
+
+    return marg;
+}
+
+
+#endif // wxUSE_CONTROLS