Further WinCE adaptations

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 2b5b11b2a2c2bac8be91b2bca346621067a7e346..81ad3ae1f0d0775717ef8270af3beb14b7a82191 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -261,6 +261,12 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                const wxPoint& pos,
                                long styleLbox)
 {
                                const wxPoint& pos,
                                long styleLbox)
 {

+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    styleDlg &= ~wxBORDER_MASK;
+    styleDlg &= ~wxRESIZE_BORDER;
+    styleDlg &= ~wxCAPTION;
+#endif
+

     if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
         return false;
 
     if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
         return false;
 


@@ -277,7 +283,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
     if ( n > 0 )
         m_listbox->SetSelection(0);
 
     if ( n > 0 )
         m_listbox->SetSelection(0);
 

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

 
     // smart phones does not support or do not waste space for wxButtons
 #ifdef __SMARTPHONE__
 
     // smart phones does not support or do not waste space for wxButtons
 #ifdef __SMARTPHONE__


@@ -296,14 +302,15 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
 #endif // !__SMARTPHONE__
 
 
 #endif // !__SMARTPHONE__
 

-    SetAutoLayout( true );

     SetSizer( topsizer );
 
     SetSizer( topsizer );
 

+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     if ( styleDlg & wxCENTRE )
         Centre(wxBOTH);
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     if ( styleDlg & wxCENTRE )
         Centre(wxBOTH);

+#endif

 
     m_listbox->SetFocus();
 
 
     m_listbox->SetFocus();
 

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index 1d14141be10b5cde9d8008bcd517d91fe61fc9f3..716aaf5aefbf82c264cc7000a655b22296993692 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -93,7 +93,11 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
 {
     if ( !wxDialog::Create(parent, wxID_ANY, title,
                            wxDefaultPosition, wxDefaultSize,
 {
     if ( !wxDialog::Create(parent, wxID_ANY, title,
                            wxDefaultPosition, wxDefaultSize,

-                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style) )
+                           wxDEFAULT_DIALOG_STYLE
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+                           | wxRESIZE_BORDER
+#endif                           
+                           | style) )

     {
         return false;
     }
     {
         return false;
     }


@@ -210,10 +214,12 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     SetAutoLayout( true );
     SetSizer( topsizer );
 

+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );

+#endif

 
     m_textFind->SetFocus();
 
 
     m_textFind->SetFocus();
 

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index abf7bd450436bb28c6f971d7139911e0c66311bf..979f05d80aaca1098ce14e3efd62aa7042a276dc 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -412,11 +412,13 @@ void wxGenericFontDialog::CreateWidgets()
 
     pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
 
 
     pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
 

+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     GetSizer()->SetItemMinSize(m_previewer, is_pda ? 100 : 430, is_pda ? 40 : 100);
     GetSizer()->SetSizeHints(this);
     GetSizer()->Fit(this);    
 
     Centre(wxBOTH);
     GetSizer()->SetItemMinSize(m_previewer, is_pda ? 100 : 430, is_pda ? 40 : 100);
     GetSizer()->SetSizeHints(this);
     GetSizer()->Fit(this);    
 
     Centre(wxBOTH);

+#endif

 
     delete[] families;
     delete[] styles;
 
     delete[] families;
     delete[] styles;

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index ed2103030d67f47f23dbfdd8f581592b08b2c231..e148a5d12139c90162aee5aa06da7fa6d761f0c2 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -150,10 +150,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     SetSizer( topsizer );
     SetAutoLayout( true );
 
     SetSizer( topsizer );
     SetAutoLayout( true );
 

+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );

+#endif

 
     m_spinctrl->SetSelection(-1, -1);
     m_spinctrl->SetFocus();
 
     m_spinctrl->SetSelection(-1, -1);
     m_spinctrl->SetFocus();

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 32dbecd26ef4d9bca35fd6d1238cc7945709ed36..8e65b6cdcd333fca359cb03f33a15bd3567dda89 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -106,7 +106,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
                                 wxDefaultPosition, wxSize(300, wxDefaultCoord),
                                 style & ~wxTextEntryDialogStyle);
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
                                 wxDefaultPosition, wxSize(300, wxDefaultCoord),
                                 style & ~wxTextEntryDialogStyle);

-    topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) );
+    topsizer->Add( m_textctrl, style & wxTE_MULTILINE ? 1 : 0, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(15,0) );

 
 #if wxUSE_VALIDATORS
     wxTextValidator validator( wxFILTER_NONE, &m_value );
 
 #if wxUSE_VALIDATORS
     wxTextValidator validator( wxFILTER_NONE, &m_value );


@@ -134,11 +134,13 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     SetAutoLayout( true );
     SetSizer( topsizer );
 

+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     if ( style & wxCENTRE )
         Centre( wxBOTH );
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     if ( style & wxCENTRE )
         Centre( wxBOTH );

+#endif

 
     m_textctrl->SetSelection(-1, -1);
     m_textctrl->SetFocus();
 
     m_textctrl->SetSelection(-1, -1);
     m_textctrl->SetFocus();

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index bef711e2790216c4a4c241939cbfb602b6143ca5..272db7296d6573ec3906706253b18dd62df5da70 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -219,7 +219,11 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                          bool showAtStartup)
            : wxDialog(parent, wxID_ANY, _("Tip of the Day"),
                       wxDefaultPosition, wxDefaultSize,
                          bool showAtStartup)
            : wxDialog(parent, wxID_ANY, _("Tip of the Day"),
                       wxDefaultPosition, wxDefaultSize,

-                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+                      wxDEFAULT_DIALOG_STYLE
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+                      | wxRESIZE_BORDER
+#endif                      
+                      )

 {
     m_tipProvider = tipProvider;
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 {
     m_tipProvider = tipProvider;
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);


@@ -255,7 +259,8 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                             wxTE_READONLY |
                             wxTE_NO_VSCROLL |
                             wxTE_RICH | // a hack to get rid of vert scrollbar
                             wxTE_READONLY |
                             wxTE_NO_VSCROLL |
                             wxTE_RICH | // a hack to get rid of vert scrollbar

-                            wxSUNKEN_BORDER);
+                            wxDEFAULT_CONTROL_BORDER
+                            );

 #if defined(__WXMSW__)
     m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
 #endif
 #if defined(__WXMSW__)
     m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
 #endif


@@ -315,10 +320,12 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     SetSizer( topsizer );
 
 
     SetSizer( topsizer );
 

+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);

+#endif

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