don't set virtual size of the window to (0, 0) if scrollbars are removed from it

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 7454236ba20bdb11946ac53cb3154652aa87c4b4..bef711e2790216c4a4c241939cbfb602b6143ca5 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -37,7 +37,6 @@
     #include "wx/dialog.h"
     #include "wx/icon.h"
     #include "wx/intl.h"
     #include "wx/dialog.h"
     #include "wx/icon.h"
     #include "wx/intl.h"

-    #include "wx/settings.h"

     #include "wx/textctrl.h"
     #include "wx/statbmp.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/statbmp.h"
     #include "wx/stattext.h"


@@ -46,6 +45,7 @@
 
 #include "wx/statline.h"
 #include "wx/artprov.h"
 
 #include "wx/statline.h"
 #include "wx/artprov.h"

+#include "wx/settings.h"

 
 #include "wx/tipdlg.h"
 
 
 #include "wx/tipdlg.h"
 


@@ -55,6 +55,20 @@
 
 static const int wxID_NEXT_TIP = 32000;  // whatever
 
 
 static const int wxID_NEXT_TIP = 32000;  // whatever
 

+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+   device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+    #define wxLARGESMALL(large,small) small
+#else
+    #define wxLARGESMALL(large,small) large
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -197,6 +211,7 @@ wxString wxFileTipProvider::GetTip()
 
 BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
     EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
 
 BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
     EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)

+    EVT_BUTTON(wxID_CLOSE, wxTipDialog::OnCancel)

 END_EVENT_TABLE()
 
 wxTipDialog::wxTipDialog(wxWindow *parent,
 END_EVENT_TABLE()
 
 wxTipDialog::wxTipDialog(wxWindow *parent,


@@ -207,23 +222,32 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
     m_tipProvider = tipProvider;
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
     m_tipProvider = tipProvider;

+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

 
     // 1) create all controls in tab order
 
 
     // 1) create all controls in tab order
 

-    wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
+    // smart phones does not support or do not waste space for wxButtons
+#ifndef __SMARTPHONE__
+    wxButton *btnClose = new wxButton(this, wxID_CLOSE);
+#endif

 
     m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
     m_checkbox->SetValue(showAtStartup);
 
 
     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"));
     wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));

+#endif

 
     wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
 
 
     wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
 

-    wxFont font = text->GetFont();
-    font.SetPointSize(int(1.6 * font.GetPointSize()));
-    font.SetWeight(wxFONTWEIGHT_BOLD);
-    
-    text->SetFont(font);
+    if (!isPda)
+    {
+        wxFont font = text->GetFont();
+        font.SetPointSize(int(1.6 * font.GetPointSize()));
+        font.SetWeight(wxFONTWEIGHT_BOLD);
+        text->SetFont(font);
+    }

 
     m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                             wxDefaultPosition, wxSize(200, 160),
 
     m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                             wxDefaultPosition, wxSize(200, 160),


@@ -260,17 +284,32 @@ 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, 20 );
-    topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
+    icon_text->Add( text, 1, wxCENTER | wxLEFT, wxLARGESMALL(20,0) );
+    topsizer->Add( icon_text, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );

 
 

-    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
+    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(10,0) );

 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
 
     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 );
+    if (isPda)
+        topsizer->Add( m_checkbox, 0, wxCENTER|wxTOP );
+    else
+        bottom->Add( m_checkbox, 0, wxCENTER );
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifdef __SMARTPHONE__
+    SetRightMenu(wxID_NEXT_TIP, _("Next"));
+    SetLeftMenu(wxID_CLOSE);
+#else
+    if (!isPda)
+        bottom->Add( 10,10,1 );
+    bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+    bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+#endif
+
+    if (isPda)
+        topsizer->Add( bottom, 0, wxCENTER | wxALL, 5 );
+    else
+        topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );

 
     SetTipText();
 
 
     SetTipText();
 


@@ -280,7 +319,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);

-

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------