Hardware defines spec.

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 1ebacc20e4ad85e15f78db6360ec8b26ccad8b90..0848b2225127e52992cb10fcbb8751b650956e34 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_CHOICE && !defined(__SMARTPHONE__)
+#if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
@@ -620,4 +620,4 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 
-#endif // wxUSE_CHOICE && !__SMARTPHONE__
+#endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index eb8936211d0f5935bbd8d903aba7ca9b8b692578..24ad03ce5103e1edb8189b7088e7ca5362078d4d 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -42,7 +42,7 @@
     #include "wx/msgdlg.h"
 #endif
 
-#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
+#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #include "wx/msw/private.h"
 #include "wx/colordlg.h"
@@ -231,4 +231,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
         *height = 299;
 }
 
-#endif
+#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index cb662e9ad9a99aab120ba2287cce9a7c10a2a2ed..cd973ac89e9ae0019fa107431a31b69f2eff009c 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -214,12 +214,12 @@ wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 {
     // take size according to layout
     wxSize bestSize(
-#ifdef __SMARTPHONE__
+#ifdef defined(__SMARTPHONE__) && defined(__WXWINCE__)
                     0,GetCharHeight()
-#else // !__SMARTPHONE__
+#else
                     GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
                     GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
-#endif // __SMARTPHONE__/!__SMARTPHONE__
+#endif
     );
 
     // correct size as for undocumented MSW variants cases (WinCE and perhaps others)

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 90f30bb4f6fd34c9fedfc37c62f45d69cdcfe5a4..32678cc5781d2020eda1385eefa72501c6f39e0b 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -47,9 +47,9 @@
     #include <commdlg.h>
 #endif
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
-#endif // __SMARTPHONE__
+#endif // __SMARTPHONE__ && __WXWINCE__
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -186,7 +186,7 @@ bool wxDialog::Create(wxWindow *parent,
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_OK, _("OK"));
 #endif
 

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index ef68c99252f1206030b7cafe6821eb49321f6442..4c8cba7388963550c8fea40129e533ef54b1779f 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_DIRDLG && !defined(__SMARTPHONE__)
+#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
 
@@ -289,4 +289,4 @@ static void ItemListFree(LPITEMIDLIST pidl)
     #include "../generic/dirdlgg.cpp"
 #endif // compiler/platform on which the code here compiles
 
-#endif // wxUSE_DIRDLG && !defined(__SMARTPHONE__)
+#endif // wxUSE_DIRDLG && !(__SMARTPHONE__ && __WXWINCE__)

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 05fd4e89ca511a9bca6813ad4ef952bd896cc9bc..a474faac76fcc226a93b8d95b84b5130ebed659e 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
+#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -511,5 +511,5 @@ int wxFileDialog::ShowModal()
 
 }
 
-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)
 

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index ecc731a834d25a392c7c4bb5c4a2319403618d5f..f80a8f8da66266ff792877cfbc52053c31b27253 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -194,7 +194,7 @@ bool wxFrame::Create(wxWindow *parent,
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif
 
@@ -322,7 +322,7 @@ void wxFrame::PositionStatusBar()
 
 void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 {
-#if defined(__SMARTPHONE__)
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
     wxMenu *autoMenu = NULL;
 
@@ -872,13 +872,13 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
         }
 #endif // wxUSE_MENUS_NATIVE
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
         // handle here commands from Smartphone menu bar
         if ( wxTopLevelWindow::HandleCommand(id, cmd, control ) )
         {
             return true;
         }
-#endif // __SMARTPHONE__
+#endif // __SMARTPHONE__ && __WXWINCE__
 
         if ( ProcessCommand(id) )
         {

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 5ea5ece2aec1ba0c4c68d012714197549c7e222a..5e94f0ebd7fed00815a49ab8e2e1107c9d6dc5b6 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -79,11 +79,11 @@ int wxMessageDialog::ShowModal()
     unsigned int msStyle = MB_OK;
     if (m_dialogStyle & wxYES_NO)
     {
-#if !defined(__SMARTPHONE__)
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
         if (m_dialogStyle & wxCANCEL)
             msStyle = MB_YESNOCANCEL;
         else
-#endif // __SMARTPHONE__
+#endif // !(__SMARTPHONE__ && __WXWINCE__)
             msStyle = MB_YESNO;
 
         if (m_dialogStyle & wxNO_DEFAULT)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 2423fa8bfb9a0293df08b6faa824e5d7ff058a9c..b6a7a6a53d8811e73cb344753912cb2ef946eaf4 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_TEXTCTRL && !defined(__SMARTPHONE__)
+#if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
@@ -2642,4 +2642,4 @@ bool wxRichEditModule::Load(int version)
 
 #endif // wxUSE_RICHEDIT
 
-#endif // wxUSE_TEXTCTRL && !__SMARTPHONE__
+#endif // wxUSE_TEXTCTRL && !(__SMARTPHONE__ && __WXWINCE__)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index ae28587509cf625723a3533da5717bae6d9c304d..a600836ce64989813d5341ec4c51842703f869e6 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -145,7 +145,7 @@ void wxTopLevelWindowMSW::Init()
 
     m_winLastFocused = (wxWindow *)NULL;
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     m_MenuBarHWND = 0;
 #endif
 }
@@ -174,7 +174,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     }
     //else: WS_OVERLAPPED is 0 anyhow, so it is on by default
 
-#ifndef __SMARTPHONE__
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
         msflags |= WS_THICKFRAME;
@@ -529,7 +529,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     }
 #endif
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetRightMenu(); // to nothing for initialization
 #endif