]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/control.cpp
Better temporary fix.
[wxWidgets.git] / src / gtk / control.cpp
index ed8b2147e84540abf8e75c377a131aeae5eecb02..613ed139fa1c74732b1d4eac2d6cf122cf6dcc15 100644 (file)
@@ -1,39 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
-// Purpose:
+// Name:        src/gtk/control.cpp
+// Purpose:     wxControl implementation for wxGTK
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "control.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_CONTROLS
 
 #include "wx/control.h"
 #if wxUSE_CONTROLS
 
 #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 <gtk/gtk.h>
+// ============================================================================
+// wxControl implementation
+// ============================================================================
 
 
-//-----------------------------------------------------------------------------
-// wxControl
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxControl creation
+// ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
 
 IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
-    m_needParent = TRUE;
-    m_createComplete = false;
+    m_needParent = true;
 }
 
 bool wxControl::Create( wxWindow *parent,
 }
 
 bool wxControl::Create( wxWindow *parent,
@@ -44,9 +45,8 @@ bool wxControl::Create( wxWindow *parent,
                       const wxValidator& validator,
                       const wxString &name )
 {
                       const wxValidator& validator,
                       const wxString &name )
 {
-    m_createComplete = false;
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
-    
+
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif
@@ -54,36 +54,6 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 
-void wxControl::SetLabel( const wxString &label )
-{
-    m_label.Empty();
-    for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )
-    {
-        if ( *pc == wxT('&') )
-        {
-            pc++; // skip it
-#if 0 // it would be unused anyhow for now - kbd interface not done yet
-            if ( *pc != wxT('&') ) m_chAccel = *pc;
-#endif
-        }
-        m_label << *pc;
-    }
-}
-
-void wxControl::PostSetLabel()
-{
-    // make sure the widget has been created, and that PostCreate has already
-    // been called
-    if (m_widget && m_createComplete && GetAdjustMinSizeFlag())
-        SetBestSize(wxDefaultSize);
-}
-
-wxString wxControl::GetLabel() const
-{
-    return m_label;
-}
-
-
 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
@@ -95,10 +65,11 @@ wxSize wxControl::DoGetBestSize() const
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
-    return wxSize(req.width, req.height);
+    wxSize best(req.width, req.height);
+    CacheBestSize(best);
+    return best;
 }
 
 }
 
-
 void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();
 void wxControl::PostCreation(const wxSize& size)
 {
     wxWindow::PostCreation();
@@ -109,58 +80,171 @@ void wxControl::PostCreation(const wxSize& size)
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
-    
-    InheritAttributes();
+
     ApplyWidgetStyle();
     SetInitialBestSize(size);
     ApplyWidgetStyle();
     SetInitialBestSize(size);
-    m_createComplete = true;
 }
 
 }
 
+// ----------------------------------------------------------------------------
+// wxControl dealing with labels
+// ----------------------------------------------------------------------------
+
+void wxControl::SetLabel( const wxString &label )
+{
+    // keep the original string internally to be able to return it later (for
+    // consistency with the other ports)
+    m_label = label;
+
+    InvalidateBestSize();
+}
+
+wxString wxControl::GetLabel() const
+{
+    return m_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);
+
+    const wxString labelGTK = GTKConvertMnemonics(label);
+
+    gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
+}
+
+// ----------------------------------------------------------------------------
+// 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);
+    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
+}
+
+void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
+{
+    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);
+}
+
+void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget)
+{
+    GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
+
+    gtk_label_set_mnemonic_widget(labelwidget, widget);
+}
+
+// ----------------------------------------------------------------------------
+// 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
+// ----------------------------------------------------------------------------
 
 
-#ifdef __WXGTK20__
-wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const
+enum MnemonicsFlag
 {
 {
-    //Format mnemonics properly for GTK2. This can be called from GTK1.x, but
-    //it's not very useful because mnemonics don't exist prior to GTK2.
-    wxString label2;
-    for (size_t i = 0; i < label.Len(); i++)
+    MNEMONICS_REMOVE,
+    MNEMONICS_CONVERT
+};
+
+static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
+{
+    const size_t len = label.length();
+    wxString labelGTK;
+    labelGTK.reserve(len);
+    for ( size_t i = 0; i < len; i++ )
     {
     {
-        if (label.GetChar(i) == wxT('&'))
-        {
-            //Mnemonic escape sequence "&&" is a literal "&" in the output.
-            if (label.GetChar(i + 1) == wxT('&'))
-            {
-                label2 << wxT('&');
-                i++;
-            }
-            //Handle special case of "&_" (i.e. "_" is the mnemonic).
-            //FIXME - Is it possible to use "_" as a GTK mnemonic? Just use a
-            //dash for now.
-            else if (label.GetChar(i + 1) == wxT('_'))
-            {
-                label2 << wxT("_-");
-                i++;
-            }
-            //Replace WX mnemonic indicator "&" with GTK indicator "_".
-            else
-            {
-                label2 << wxT('_');
-            }
-        }
-        else if (label.GetChar(i) == wxT('_'))
-        {
-            //Escape any underlines in the string so GTK doesn't use them.
-            label2 << wxT("__");
-        }
-        else
+        wxChar ch = label[i];
+
+        switch ( ch )
         {
         {
-            label2 << label.GetChar(i);
+            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 label2;
+
+    return labelGTK;
 }
 }
-#endif
 
 
+/* static */
+wxString wxControl::GTKRemoveMnemonics(const wxString& label)
+{
+    return GTKProcessMnemonics(label, MNEMONICS_REMOVE);
+}
+
+/* static */
+wxString wxControl::GTKConvertMnemonics(const wxString& label)
+{
+    return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
+}
+
+// ----------------------------------------------------------------------------
+// wxControl styles (a.k.a. attributes)
+// ----------------------------------------------------------------------------
 
 wxVisualAttributes wxControl::GetDefaultAttributes() const
 {
 
 wxVisualAttributes wxControl::GetDefaultAttributes() const
 {
@@ -191,7 +275,7 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
 
     if (state == -1)
         state = GTK_STATE_NORMAL;
 
     if (state == -1)
         state = GTK_STATE_NORMAL;
-        
+
     // get the style's colours
     attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
                           style->fg[state].green >> SHIFT,
     // get the style's colours
     attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
                           style->fg[state].green >> SHIFT,
@@ -206,21 +290,20 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                               style->bg[state].blue  >> SHIFT);
 
     // get the style's font
                               style->bg[state].blue  >> SHIFT);
 
     // get the style's font
-#ifdef __WXGTK20__
     if ( !style->font_desc )
     if ( !style->font_desc )
-        style = gtk_widget_get_default_style();  
+        style = gtk_widget_get_default_style();
     if ( style && style->font_desc )
     if ( style && style->font_desc )
-    {  
-        wxNativeFontInfo info;  
-        info.description = style->font_desc;  
-        attr.font = wxFont(info);  
-    }  
-    else  
-    {  
+    {
+        wxNativeFontInfo info;
+        info.description = pango_font_description_copy(style->font_desc);
+        attr.font = wxFont(info);
+    }
+    else
+    {
         GtkSettings *settings = gtk_settings_get_default();
         gchar *font_name = NULL;
         g_object_get ( settings,
         GtkSettings *settings = gtk_settings_get_default();
         gchar *font_name = NULL;
         g_object_get ( settings,
-                       "gtk-font-name", 
+                       "gtk-font-name",
                        &font_name,
                        NULL);
         if (!font_name)
                        &font_name,
                        NULL);
         if (!font_name)
@@ -228,71 +311,59 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
         else
             attr.font = wxFont(wxString::FromAscii(font_name));
         g_free (font_name);
         else
             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;
 }
 
 
 //static
 wxVisualAttributes
     return attr;
 }
 
 
 //static
 wxVisualAttributes
-wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(void),
+wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t widget_new,
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     GtkWidget* widget = widget_new();
     GtkWidget* widget = widget_new();
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);
     return attr;
 }
 
 //static
 wxVisualAttributes
     return attr;
 }
 
 //static
 wxVisualAttributes
-wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(const gchar*),
+wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t widget_new,
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     GtkWidget* widget = widget_new("");
     GtkWidget* widget = widget_new("");
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);
     return attr;
 }
 
 
 //static
 wxVisualAttributes
     return attr;
 }
 
 
 //static
 wxVisualAttributes
-wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustment*),
+wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     GtkWidget* widget = widget_new(NULL);
     GtkWidget* widget = widget_new(NULL);
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);
     return attr;
 }
 
     return attr;
 }
 
-void wxControl::ApplyWidgetStyle(bool forceStyle)
-{
-    GtkRcStyle *style = CreateWidgetStyle(forceStyle);
-    if ( style )
-    {
-        DoApplyWidgetStyle(style);
-        gtk_rc_style_unref(style);
-    }
-}
-
-void wxControl::DoApplyWidgetStyle(GtkRcStyle *style)
-{
-    gtk_widget_modify_style(m_widget, style);
-}
-
-
 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS
-