Adapted printing samples makefiles.

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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 78a423326e45cac0bd7b313c4269174319340334..a3514774fd11c6bc127c94385bc1a03de3e85619 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -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
 // ----------------------------------------------------------------------------


@@ -210,21 +224,28 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     // 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__
+    // FIXME: use stock wxID_CLOSE button here!
+    wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("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..."), wxDefaultPosition, wxSize(-1,30) );
-#if defined(__WXMSW__) || defined(__WXPM__)
-    text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
-#else
-    text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
+    wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
+
+#ifndef __SMARTPHONE__
+    wxFont font = text->GetFont();
+    font.SetPointSize(int(1.6 * font.GetPointSize()));
+    font.SetWeight(wxFONTWEIGHT_BOLD);
+    text->SetFont(font);

 #endif
 #endif

-//
-//    text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));

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


@@ -235,8 +256,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                             wxSUNKEN_BORDER);
 #if defined(__WXMSW__)
     m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
                             wxSUNKEN_BORDER);
 #if defined(__WXMSW__)
     m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));

-#else
-    m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));

 #endif
 
 //#if defined(__WXPM__)
 #endif
 
 //#if defined(__WXPM__)


@@ -263,17 +282,25 @@ 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 );
     bottom->Add( m_checkbox, 0, wxCENTER );
 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
     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_CANCEL, _("Close"));
+#else

     bottom->Add( 10,10,1 );
     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 );
+    bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+    bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+#endif
+
+    topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );

 
     SetTipText();
 
 
     SetTipText();
 


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

-

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