Store menus titles in menus themselves in wxOSX.

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index d339e25aeb5122ad2c6738eccdfa9b3b0f88c241..0191a2f91963ab654f5c73eab6b611b06677ccbb 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -12,11 +12,19 @@
 
 #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/gtk/private.h"
 #include "wx/gtk/private.h"

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

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


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

-    m_needParent = TRUE;

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


@@ -55,18 +62,22 @@ wxSize wxControl::DoGetBestSize() const
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
     // 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(req.width, req.height);
+    wxSize best;
+    if (m_wxwindow)
+    {
+        // this is not a native control, size_request is likely to be (0,0)
+        best = wxControlBase::DoGetBestSize();
+    }
+    else
+    {
+        GtkRequisition req;
+        GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req);
+        best.Set(req.width, req.height);
+    }

     CacheBestSize(best);
     return best;
 }
 
     CacheBestSize(best);
     return best;
 }
 

-

 void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();
 void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();


@@ -78,141 +89,114 @@ void wxControl::PostCreation(const wxSize& size)
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
 
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
 

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

 {
 {

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

 }
 
 }
 

-wxString wxControl::GetLabel() const
-{
-    return m_label;
-}
+// ----------------------------------------------------------------------------
+// wxControl dealing with labels
+// ----------------------------------------------------------------------------

 
 void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
 {
 
 void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
 {

-    // don't call the virtual function which might call this one back again
-    wxControl::SetLabel(label);
+    // save the original label
+    wxControlBase::SetLabel(label);

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

-
-#ifdef __WXGTK20__

     gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
     gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));

-#else
-    gtk_label_set(w, wxGTK_CONV(labelGTK));
-#endif

 }
 
 }
 

-void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
+void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label)

 {
 {

-    wxControl::SetLabel(label);
+    const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label);
+    gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK));
+}
+

 
 

-    // frames don't support mnemonics even under GTK+ 2
-    const wxString labelGTK = GTKRemoveMnemonics(label);
+// ----------------------------------------------------------------------------
+// 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)
+// ----------------------------------------------------------------------------

 
 

-    gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL
-                                            : wxGTK_CONV(labelGTK));
+GtkWidget* wxControl::GTKCreateFrame(const wxString& 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...
+
+    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

 }
 
 }
 

-// 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::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)

 {
 {

-    MNEMONICS_REMOVE,
-    MNEMONICS_CONVERT
-};
+    GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
+    GTKSetLabelForLabel(labelwidget, label);
+}

 
 

-static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
+void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style)

 {
 {

-    const size_t len = label.length();
-    wxString labelGTK;
-    labelGTK.reserve(len);
-    for ( size_t i = 0; i < len; i++ )
-    {
-        wxChar ch = label[i];
+    gtk_widget_modify_style(GTK_WIDGET(w), style);
+    gtk_widget_modify_style(gtk_frame_get_label_widget (w), style);
+}

 
 

-        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;
-        }
-    }
+void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget)
+{
+    GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));

 
 

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

-#ifdef __WXGTK20__
-    return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
-#else
-    return GTKRemoveMnemonics(label);
-#endif
+    return wxConvertMnemonicsToGTK(label);
+}
+
+/* static */
+wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label)
+{
+    return wxConvertMnemonicsToGTKMarkup(label);

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


@@ -225,9 +209,6 @@ 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,


@@ -250,20 +231,13 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
         state = GTK_STATE_NORMAL;
 
     // get the style's colours
         state = GTK_STATE_NORMAL;
 
     // 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
 
     // get the style's font

-#ifdef __WXGTK20__

     if ( !style->font_desc )
         style = gtk_widget_get_default_style();
     if ( style && style->font_desc )
     if ( !style->font_desc )
         style = gtk_widget_get_default_style();
     if ( style && style->font_desc )


@@ -286,10 +260,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
             attr.font = wxFont(wxString::FromAscii(font_name));
         g_free (font_name);
     }
             attr.font = wxFont(wxString::FromAscii(font_name));
         g_free (font_name);
     }

-#else
-    // TODO: isn't there a way to get a standard gtk 1.2 font?
-    attr.font = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-#endif

 
     return attr;
 }
 
     return attr;
 }


@@ -344,5 +314,17 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
     return attr;
 }
 
     return attr;
 }
 

-#endif // wxUSE_CONTROLS
+// ----------------------------------------------------------------------------
+// idle handling
+// ----------------------------------------------------------------------------
+
+void wxControl::OnInternalIdle()
+{
+    if ( GTKShowFromOnIdle() )
+        return;

 
 

+    if ( wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen() )
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+#endif // wxUSE_CONTROLS