From 82ef81ed9c797178d9868823097e272bfddc4c93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 22 Dec 2004 07:22:25 +0000 Subject: [PATCH] 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 --- build/palmos/makefile | 5 ----- include/wx/fontutil.h | 4 ++-- include/wx/renderer.h | 2 +- src/common/appbase.cpp | 2 +- src/common/appcmn.cpp | 4 ++-- src/common/cmndata.cpp | 2 +- src/common/containr.cpp | 4 ++-- src/common/fontcmn.cpp | 2 +- src/common/gdicmn.cpp | 2 +- src/common/msgout.cpp | 4 ++-- src/common/utilscmn.cpp | 2 +- 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/build/palmos/makefile b/build/palmos/makefile index 8461041858..f25610f8ee 100644 --- 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 e944c158e7..1a1b917ba1 100644 --- 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 5ccc505658..e450914bd4 100644 --- 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 5c89543509..98fcc2b4d1 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -43,7 +43,7 @@ #include // 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 009f9dcf69..dc8baac753 100644 --- 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 c2208533aa..bb44120bcf 100644 --- 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 #include "wx/msw/private.h" diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 8b62297a92..a08c3b16ae 100644 --- 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 666585f368..c4416f5bec 100644 --- 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 49df9a3f89..5de95ee422 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -42,7 +42,7 @@ #include "wx/log.h" #include -#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 54cd442fa1..77c19feb6d 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -52,7 +52,7 @@ #include #include -#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 f1fc29b1db..d3ecc68a97 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -95,7 +95,7 @@ #include #endif -#if defined(__WXMSW__) && !defined(__WXPALMOS__) +#if defined(__WXMSW__) #include "wx/msw/private.h" #endif -- 2.45.2