]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed typo
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 27 Jun 2004 13:47:52 +0000 (13:47 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 27 Jun 2004 13:47:52 +0000 (13:47 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/stattext.cpp
src/gtk1/stattext.cpp

index 6f068dc3d0d4d2fe68b9aec7bff05d0be28543b0..9b5aa5cb2f2faa946d2bfd0c65b38ed36a07e6d6 100644 (file)
@@ -144,9 +144,8 @@ void wxStaticText::SetLabel( const wxString &label )
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else
-#else
-        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 #endif
 #endif
+        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
index 6f068dc3d0d4d2fe68b9aec7bff05d0be28543b0..9b5aa5cb2f2faa946d2bfd0c65b38ed36a07e6d6 100644 (file)
@@ -144,9 +144,8 @@ void wxStaticText::SetLabel( const wxString &label )
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else
         gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
     else
-#else
-        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 #endif
 #endif
+        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))