don't crash trying to dereference NULL m_selection (happens when showing a grid witho...

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 3ae7cd8462f0f2d14d826a8f587495999bbb3920..d1ce8278e02a292d1affdb40f21bf1d65f9a3744 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -37,13 +37,15 @@
     #include "wx/dialog.h"
     #include "wx/icon.h"
     #include "wx/intl.h"
-    #include "wx/layout.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/statline.h"
+#include "wx/artprov.h"
 
 #include "wx/tipdlg.h"
 
@@ -83,7 +85,7 @@ public:
 // Empty implementation for now to keep the linker happy
 wxString wxRegTipProvider::GetTip()
 {
-    return "";
+    return wxEmptyString;
 }
 
 #endif // __WIN32__
@@ -152,7 +154,7 @@ wxString wxFileTipProvider::GetTip()
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
-    EVT_BUTTON(wxID_NEXT_TIP, OnNextTip)
+    EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
 END_EVENT_TABLE()
 
 wxTipDialog::wxTipDialog(wxWindow *parent,
@@ -164,88 +166,68 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 {
     m_tipProvider = tipProvider;
 
-    wxSize sizeBtn = GetStandardButtonSize();
-    wxLayoutConstraints *c;
+    // 1) create all controls in tab order
 
-    // create the controls in the right order, then set the constraints
     wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
-    m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
-    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next"));
 
-    wxTextCtrl *text = new wxTextCtrl(this, -1, _("Did you know..."),
-                                      wxDefaultPosition, wxDefaultSize,
-                                      wxTE_READONLY | wxNO_BORDER);
-    text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
-    text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+    m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
+    m_checkbox->SetValue(showAtStartup);
 
-    m_text = new wxTextCtrl(this, -1, _T(""),
-                            wxDefaultPosition, wxDefaultSize,
-                            wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER);
-    m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
+    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
 
-#ifdef __WXMSW__
-    wxIcon icon("wxICON_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
-    #include "wx/generic/tip.xpm"
-    wxIcon icon(tipIcon);
+    text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
+#endif
+//
+//    text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+
+    m_text = new wxTextCtrl(this, -1, wxT(""),
+                            wxDefaultPosition, wxSize(200, 160),
+                            wxTE_MULTILINE |
+                            wxTE_READONLY |
+                            wxTE_NO_VSCROLL |
+                            wxTE_RICH | // a hack to get rid of vert scrollbar
+                            wxSUNKEN_BORDER);
+#if defined(__WXMSW__)
+    m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
+#else
+    m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));
 #endif
 
+    wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 
-    const int iconSize = icon.GetWidth();
-
-    c = new wxLayoutConstraints;
-    c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN);
-    c->left.RightOf(bmp, 2*LAYOUT_X_MARGIN);
-    c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
-    c->height.Absolute(2*text->GetSize().GetHeight());
-    text->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->centreY.SameAs(text, wxCentreY);
-    c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
-    c->width.Absolute(iconSize);
-    c->height.Absolute(iconSize);
-    bmp->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->bottom.SameAs(this, wxBottom, 2*LAYOUT_X_MARGIN);
-    c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
-    c->width.Absolute(sizeBtn.GetWidth());
-    c->height.Absolute(sizeBtn.GetHeight());
-    btnClose->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->bottom.SameAs(this, wxBottom, 2*LAYOUT_X_MARGIN);
-    c->right.LeftOf(btnClose, 2*LAYOUT_X_MARGIN);
-    c->width.Absolute(sizeBtn.GetWidth());
-    c->height.Absolute(sizeBtn.GetHeight());
-    btnNext->SetConstraints(c);
-
-    c = new wxLayoutConstraints;
-    c->bottom.SameAs(this, wxBottom, 2*LAYOUT_X_MARGIN);
-    c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
-    c->width.AsIs();
-    c->height.AsIs();
-    m_checkbox->SetConstraints(c);
-    m_checkbox->SetValue(showAtStartup);
+    // 2) put them in boxes
 
-    c = new wxLayoutConstraints;
-    c->top.Below(text);
-    c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
-    c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
-    c->bottom.Above(btnClose, -2*LAYOUT_Y_MARGIN);
-    m_text->SetConstraints(c);
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
-    SetTipText();
+    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 );
 
-    Centre(wxBOTH | wxCENTER_FRAME);
+    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
-    wxSize size(5*sizeBtn.GetWidth(), 10*sizeBtn.GetHeight());
-    SetSize(size);
-    SetSizeHints(size.x, size.y);
+    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 );
+    topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
+
+    SetTipText();
 
     SetAutoLayout(TRUE);
+    SetSizer( topsizer );
+
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+
+    Centre(wxBOTH | wxCENTER_FRAME);
+
 }
 
 // ----------------------------------------------------------------------------