Change to wxMenuBar::Remove(),

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 72f4675b2516cc7b55ff5e8474ff1bcfe9765089..f4631cf86d222c22dbd319800f6d2bae83e97c6e 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -40,6 +40,7 @@
     #include "wx/settings.h"
     #include "wx/textctrl.h"
     #include "wx/statbmp.h"
     #include "wx/settings.h"
     #include "wx/textctrl.h"
     #include "wx/statbmp.h"

+    #include "wx/stattext.h"

     #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
     #include "wx/sizer.h"
 #endif // WX_PRECOMP
 


@@ -171,18 +172,25 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     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"));
+    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));

 
 

-    wxTextCtrl *text = new wxTextCtrl(this, -1, _("Did you know..."),
-                                      wxDefaultPosition, wxDefaultSize,
-                                      wxTE_READONLY | wxNO_BORDER);
+    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
+#if defined(__WXMSW__)
+    text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
+#else

     text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
     text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));

-    text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+#endif
+//
+//    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),
                             wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER);
                             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));
     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");


@@ -198,16 +206,17 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     icon_text->Add( bmp, 0, wxCENTER );
     
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     icon_text->Add( bmp, 0, wxCENTER );

-    icon_text->Add( text, 1, wxCENTER | wxLEFT, 10 );
+    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 );
     bottom->Add( m_checkbox, 0, wxCENTER );
     topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
     
     topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
     bottom->Add( m_checkbox, 0, wxCENTER );

+    bottom->Add( 10,10,1 );

     bottom->Add( btnNext, 0, wxCENTER | wxLEFT, 10 );
     bottom->Add( btnClose, 0, wxCENTER | wxLEFT, 10 );
     bottom->Add( btnNext, 0, wxCENTER | wxLEFT, 10 );
     bottom->Add( btnClose, 0, wxCENTER | wxLEFT, 10 );

-    topsizer->Add( bottom, 0, wxALIGN_RIGHT | wxALL, 10 );
+    topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );

 
     SetTipText();
     
 
     SetTipText();