Hardware defines spec.

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

diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp
index 59971875c4f41e92a81e9ce93a69ea0669425fbe..5eafda649c03159a42e430630fa5dbd9adba8087 100644 (file)
--- a/src/msw/wince/choicece.cpp
+++ b/src/msw/wince/choicece.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/choicece.cpp
-// Purpose:     wxChoice implementation for Smartphones
+// Purpose:     wxChoice implementation for smart phones driven by WinCE
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004
@@ -39,7 +39,7 @@
 #include "wx/msw/missing.h"
 #include "wx/msw/winundef.h"
 
-#if wxUSE_CHOICE && defined(__SMARTPHONE__)
+#if wxUSE_CHOICE && defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
 #if wxUSE_EXTENDED_RTTI
 // TODO
@@ -545,4 +545,4 @@ void wxChoice::DoGetPosition(int *x, int *y) const
     wxConstCast(this, wxChoice)->m_hWnd = hWnd;
 }
 
-#endif // wxUSE_CHOICE && __SMARTPHONE__
+#endif // wxUSE_CHOICE && __SMARTPHONE__ && __WXWINCE__

diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index ac530e7158ff7f3803903de69040d11a47c5a451..aa11f5f4542184a9e9da10b9fd1811c25f8f66be 100644 (file)
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/filedlgwce.cpp
-// Purpose:     wxFileDialog for WinCE (SmartPhone)
+// Purpose:     wxFileDialog implementation for smart phones driven by WinCE
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -31,7 +31,7 @@
 // Only use this for MS SmartPhone. Use standard file dialog
 // for Pocket PC.
 
-#if wxUSE_FILEDLG && defined(__SMARTPHONE__)
+#if wxUSE_FILEDLG && defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -135,5 +135,4 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     files = m_fileNames;
 }
 
-#endif // wxUSE_FILEDLG
-
+#endif // wxUSE_FILEDLG && __SMARTPHONE__ && __WXWINCE__

diff --git a/src/msw/wince/menuce.cpp b/src/msw/wince/menuce.cpp
index 10c97cd142c1f4e3d5506ac806425425e9b41c0f..7f4d51c3beda14c84c4940bc1016329fe95df428 100644 (file)
--- a/src/msw/wince/menuce.cpp
+++ b/src/msw/wince/menuce.cpp
@@ -38,7 +38,7 @@
     #include "wx/menu.h"
 #endif //WX_PRECOMP
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
 #include <windows.h>
 #include <ole2.h>
@@ -257,5 +257,5 @@ bool wxTopLevelWindowMSW::HandleCommand(WXWORD id, WXWORD WXUNUSED(cmd), WXHWND
     return false;
 }
 
-#endif // __SMARTPHONE__
+#endif // __SMARTPHONE__ && __WXWINCE__
 

diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp
index 86f6c7d248f8fde208cb3b0c363287efbc1f8e5f..9fe3ce639450606385246d340bfd5e4df027ac88 100644 (file)
--- a/src/msw/wince/textctrlce.cpp
+++ b/src/msw/wince/textctrlce.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/textctrlce.cpp
-// Purpose:     wxTextCtrl implementation for Smartphones
+// Purpose:     wxTextCtrl implementation for smart phones driven by WinCE
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     30.08.2004
@@ -40,7 +40,7 @@
 #include "wx/msw/missing.h"
 #include "wx/msw/winundef.h"
 
-#if wxUSE_TEXTCTRL && defined(__SMARTPHONE__)
+#if wxUSE_TEXTCTRL && defined(__SMARTPHONE__) && defined(__WXWINCE__)
 
 #define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
 
@@ -1250,4 +1250,4 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
     }
 }
 
-#endif // wxUSE_TEXTCTRL && __SMARTPHONE__
+#endif // wxUSE_TEXTCTRL && __SMARTPHONE__ && __WXWINCE__