Corrected wxScrolledWindow's OnSize behaviour.

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 96a2dfbe47a6d1180979d4470a035fe58a517db0..417a093903a51da7469742805b08cce7c2e08518 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -84,7 +84,7 @@ public:
 // Empty implementation for now to keep the linker happy
 wxString wxRegTipProvider::GetTip()
 {
 // Empty implementation for now to keep the linker happy
 wxString wxRegTipProvider::GetTip()
 {

-    return "";
+    return wxEmptyString;

 }
 
 #endif // __WIN32__
 }
 
 #endif // __WIN32__


@@ -166,15 +166,15 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     m_tipProvider = tipProvider;
 
     // 1) create all controls in tab order
     m_tipProvider = tipProvider;
 
     // 1) create all controls in tab order

-    
+

     wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
     wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));

-    
+

     m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
     m_checkbox->SetValue(showAtStartup);
     m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
     m_checkbox->SetValue(showAtStartup);

-    
-    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next"));

 
 

-    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,25) );
+    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
+
+    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );

 #if defined(__WXMSW__)
     text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
 #else
 #if defined(__WXMSW__)
     text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
 #else


@@ -183,10 +183,17 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 //
 //    text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
 
 //
 //    text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
 

-    m_text = new wxTextCtrl(this, -1, _T(""),
+    m_text = new wxTextCtrl(this, -1, wxT(""),

                             wxDefaultPosition, wxSize(200, 160),
                             wxDefaultPosition, wxSize(200, 160),

-                            wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER);
+                            wxTE_MULTILINE |
+                            wxTE_READONLY |
+                            wxTE_RICH | // a hack to get rid of vert scrollbar
+                            wxSUNKEN_BORDER);
+#if defined(__WXMSW__)
+    m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
+#else

     m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
     m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));

+#endif

 
 #if defined(__WXMSW__) || defined(__WXPM__)
     wxIcon icon("wxICON_TIP");
 
 #if defined(__WXMSW__) || defined(__WXPM__)
     wxIcon icon("wxICON_TIP");


@@ -199,12 +206,12 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     // 2) put them in boxes
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     // 2) put them in boxes
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

-    
+

     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     icon_text->Add( bmp, 0, wxCENTER );
     icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 );
     topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     icon_text->Add( bmp, 0, wxCENTER );
     icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 );
     topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );

-    
+

     topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
     topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );


@@ -215,10 +222,10 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
 
     SetTipText();
     topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
 
     SetTipText();

-    
+

     SetAutoLayout(TRUE);
     SetSizer( topsizer );
     SetAutoLayout(TRUE);
     SetSizer( topsizer );

-    
+

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );