Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / src / generic / tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 7562a31424fae4e77df20719c6eb3c140fca478f..f4631cf86d222c22dbd319800f6d2bae83e97c6e 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -172,9 +172,9 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
     m_checkbox->SetValue(showAtStartup);
     
-    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next"));
+    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
 
-    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,25) );
+    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
 #if defined(__WXMSW__)
     text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
 #else
@@ -186,7 +186,11 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     m_text = new wxTextCtrl(this, -1, wxT(""),
                             wxDefaultPosition, wxSize(200, 160),
                             wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER);
+#if defined(__WXMSW__)
+    m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
+#else
     m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
+#endif
 
 #if defined(__WXMSW__) || defined(__WXPM__)
     wxIcon icon("wxICON_TIP");