Fix typo in last commit

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 7012a7572c67089da76672e00a96e2d63a83b4cb..5a06a3910f43dfd0af92e470d8ffe58df00eb0ea 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -123,19 +123,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,6 +160,8 @@ 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);
 }
     GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
     GTKSetLabelForLabel(labelwidget, label);
 }