reSWIGged

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 735fdd924f6df29d125d0cc3903bc34088eb0abb..4368959b6c8bf116e789e6d05bdddc9f3a472a91 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin


@@ -10,18 +10,21 @@
 // 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
 
 #if wxUSE_CONTROLS
 

+#include "wx/log.h"

 #include "wx/control.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"
 
 #include "wx/control.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"
 

-//-----------------------------------------------------------------------------
-// wxControl
-//-----------------------------------------------------------------------------
+// ============================================================================
+// wxControl implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxControl creation
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 


@@ -63,7 +66,6 @@ wxSize wxControl::DoGetBestSize() const
     return best;
 }
 
     return best;
 }
 

-

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


@@ -104,29 +106,57 @@ void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& 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
+}
+
+// ----------------------------------------------------------------------------
+// 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)
 {
 }
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 {

-    wxControl::SetLabel(label);
+    GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
+    GTKSetLabelForLabel(labelwidget, label);
+}

 
 

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

 
 

-    gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL
-                                            : wxGTK_CONV(labelGTK));
+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
 // 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
 {
     MNEMONICS_REMOVE,
 enum MnemonicsFlag
 {
     MNEMONICS_REMOVE,


@@ -256,7 +286,6 @@ 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 )
         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 )


@@ -279,10 +308,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;
 }