Final MSW/PalmOS split. Remove dump copies of MSW specific code.

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

diff --git a/build/palmos/makefile b/build/palmos/makefile
index 8461041858500bc7460ce6174a44bc925a9309ab..f25610f8ee341a27774537dec7d851dcdd1052cf 100644 (file)
--- a/build/palmos/makefile
+++ b/build/palmos/makefile
@@ -206,7 +206,6 @@ SOURCES =  ../../samples/minimal/minimal.cpp \
 ../../src/palmos/dcprint.cpp \
 ../../src/palmos/dcscreen.cpp \
 ../../src/palmos/dialog.cpp \
-../../src/palmos/dialup.cpp \
 ../../src/palmos/dib.cpp \
 ../../src/palmos/dir.cpp \
 ../../src/palmos/dirdlg.cpp \
@@ -238,10 +237,8 @@ SOURCES =  ../../samples/minimal/minimal.cpp \
 ../../src/palmos/menu.cpp \
 ../../src/palmos/menuitem.cpp \
 ../../src/palmos/metafile.cpp \
-../../src/palmos/mimetype.cpp \
 ../../src/palmos/minifram.cpp \
 ../../src/palmos/msgdlg.cpp \
-../../src/palmos/mslu.cpp \
 ../../src/palmos/nativdlg.cpp \
 ../../src/palmos/notebook.cpp \
 ../../src/palmos/ownerdrw.cpp \
@@ -254,8 +251,6 @@ SOURCES =  ../../samples/minimal/minimal.cpp \
 ../../src/palmos/radiobut.cpp \
 ../../src/palmos/regconf.cpp \
 ../../src/palmos/region.cpp \
-../../src/palmos/registry.cpp \
-../../src/palmos/renderer.cpp \
 ../../src/palmos/scrolbar.cpp \
 ../../src/palmos/settings.cpp \
 ../../src/palmos/slider.cpp \

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index e944c158e7c9955962bef1c9c3d88b97324bf51d..1a1b917ba1675fad1aa772e43d544df0945bdfe6 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -26,7 +26,7 @@
 
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
     #include "wx/msw/wrapwin.h"
 #endif
 
@@ -109,7 +109,7 @@ public:
 
     // set the XFLD
     void SetXFontName(const wxString& xFontName);
-#elif defined(__WXMSW__) && !defined(__WXPALMOS__)
+#elif defined(__WXMSW__)
     LOGFONT      lf;
 #elif defined(__WXPM__)
     // OS/2 native structures that define a font

diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index 5ccc5056584bd2a7d3a7c37df2ab17b2270aed65..e450914bd4d8907a9869a9296bf2e081cdf90e0b 100644 (file)
--- a/include/wx/renderer.h
+++ b/include/wx/renderer.h
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindow;
 #include "wx/gdicmn.h" // for wxPoint
 
 // some platforms have their own renderers, others use the generic one
-#if (defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK__)) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK__)
     #define wxHAS_NATIVE_RENDERER
 #else
     #undef wxHAS_NATIVE_RENDERER

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 5c89543509d1d30701d1f9277050af37ed91a741..98fcc2b4d165b7857d2eb2e2eb431a0f2a7c7002 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -43,7 +43,7 @@
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
   #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
 #endif
 

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 009f9dcf6950cea2c5209be337e5c902023cb298..dc8baac753ec6e4c11dbd625c9b72815c0bffad6 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -47,8 +47,8 @@
 #include "wx/utils.h"
 #include "wx/ptr_scpd.h"
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+#if defined(__WXMSW__)
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
 #endif
 
 #if wxUSE_FONTMAP

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index c2208533aaaed8635b45c2bb4f8f615976cad831..bb44120bcf56bd152efe1d73d06fef698e42ff39 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -49,7 +49,7 @@
     #include "wx/paper.h"
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
     #include <windowsx.h>
     #include "wx/msw/private.h"
 

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 8b62297a92db06dd433864325cf8908ebb90ea39..a08c3b16aeef1c7b38019190c3727c9d4e3e5ed4 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -291,7 +291,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
 
         wxWindow *child = node->GetData();
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
         bool is_not_msw_rb = !m_winLastFocused ||
                                 !wxIsKindOf(m_winLastFocused,wxRadioButton);
 #else
@@ -306,7 +306,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             // direction we're coming
             event.SetEventObject(m_winParent);
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
             // we need to hop to the next activated
             // radio button, not just the next radio
             // button under MSW

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 666585f368e8d9ab906cabe5441c6ef216332b2a..c4416f5bec3301a82f9c768b6773a6c5dbd90bb2 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -36,7 +36,7 @@
 
 #include "wx/gdicmn.h"
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
   #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
   #include  "wx/msw/winundef.h"
 #endif

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 49df9a3f8982024a910918755da00e20ddd5760e..5de95ee422c64f3a6f94d7fc83974afa039f952e 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -42,7 +42,7 @@
 #include "wx/log.h"
 #include <string.h>
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
 #include "wx/msw/wrapwin.h"
 #endif
 

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 54cd442fa1ff14db7c9198ce349efdf393847a46..77c19feb6d42d055964c414edbeeb82242d5227f 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -52,7 +52,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
     #include "wx/msw/private.h"
 #endif
 #ifdef __WXMAC__
@@ -118,7 +118,7 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f1fc29b1db106340fa7e41ff11c3f6c049a3d274..d3ecc68a974b63366ddc0d858127756f2c4ce2ad 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -95,7 +95,7 @@
     #include <sys/stat.h>
 #endif
 
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
     #include "wx/msw/private.h"
 #endif