added EVT_HEADER_DRAGGING_CANCELLED event sent when either resizing or reordering...

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index e8fbb90d0c137a41c123033c64fa4b2007fd840d..7b3ce8b0b72468cc93d419ed90d0ef99bb8b64ca 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -71,6 +71,7 @@ static const int wxID_NEXT_TIP = 32000;  // whatever
 
 // an implementation which takes the tips from the text file - each line
 // represents a tip
+#if wxUSE_TEXTFILE
 class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
 {
 public:
@@ -83,6 +84,7 @@ private:
 
     DECLARE_NO_COPY_CLASS(wxFileTipProvider)
 };
+#endif // wxUSE_TEXTFILE
 
 #ifdef __WIN32__
 // TODO an implementation which takes the tips from the given registry key
@@ -137,7 +139,7 @@ private:
 // ----------------------------------------------------------------------------
 // wxFileTipProvider
 // ----------------------------------------------------------------------------
-
+#if wxUSE_TEXTFILE
 wxFileTipProvider::wxFileTipProvider(const wxString& filename,
                                      size_t currentTip)
                  : wxTipProvider(currentTip), m_textfile(filename)
@@ -203,6 +205,7 @@ wxString wxFileTipProvider::GetTip()
 
     return tip;
 }
+#endif // wxUSE_TEXTFILE
 
 // ----------------------------------------------------------------------------
 // wxTipDialog
@@ -215,7 +218,7 @@ END_EVENT_TABLE()
 wxTipDialog::wxTipDialog(wxWindow *parent,
                          wxTipProvider *tipProvider,
                          bool showAtStartup)
-           : wxDialog(parent, wxID_ANY, _("Tip of the Day"),
+           : wxDialog(GetParentForModalDialog(parent), wxID_ANY, _("Tip of the Day"),
                       wxDefaultPosition, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
                       )
@@ -225,20 +228,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     // 1) create all controls in tab order
 
-    // smart phones does not support or do not waste space for wxButtons
-#ifndef __SMARTPHONE__
-    wxButton *btnClose = new wxButton(this, wxID_CLOSE);
-    SetAffirmativeId(wxID_CLOSE);
-#endif
-
-    m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
-    m_checkbox->SetValue(showAtStartup);
-
-    // smart phones does not support or do not waste space for wxButtons
-#ifndef __SMARTPHONE__
-    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
-#endif
-
     wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
 
     if (!isPda)
@@ -279,6 +268,22 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
 //#endif
 
+    m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
+    m_checkbox->SetValue(showAtStartup);
+    m_checkbox->SetFocus();
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifndef __SMARTPHONE__
+    wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
+#endif
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifndef __SMARTPHONE__
+    wxButton *btnClose = new wxButton(this, wxID_CLOSE);
+    SetAffirmativeId(wxID_CLOSE);
+#endif
+
+
     // 2) put them in boxes
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
@@ -326,11 +331,13 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 // our public interface
 // ----------------------------------------------------------------------------
 
+#if wxUSE_TEXTFILE
 wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
                                        size_t currentTip)
 {
     return new wxFileTipProvider(filename, currentTip);
 }
+#endif // wxUSE_TEXTFILE
 
 bool wxShowTip(wxWindow *parent,
                wxTipProvider *tipProvider,