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
This commit is contained in:
Włodzimierz Skiba
2004-12-22 07:22:25 +00:00
parent 7874328271
commit 82ef81ed9c
11 changed files with 14 additions and 19 deletions

View File

@@ -206,7 +206,6 @@ SOURCES = ../../samples/minimal/minimal.cpp \
../../src/palmos/dcprint.cpp \ ../../src/palmos/dcprint.cpp \
../../src/palmos/dcscreen.cpp \ ../../src/palmos/dcscreen.cpp \
../../src/palmos/dialog.cpp \ ../../src/palmos/dialog.cpp \
../../src/palmos/dialup.cpp \
../../src/palmos/dib.cpp \ ../../src/palmos/dib.cpp \
../../src/palmos/dir.cpp \ ../../src/palmos/dir.cpp \
../../src/palmos/dirdlg.cpp \ ../../src/palmos/dirdlg.cpp \
@@ -238,10 +237,8 @@ SOURCES = ../../samples/minimal/minimal.cpp \
../../src/palmos/menu.cpp \ ../../src/palmos/menu.cpp \
../../src/palmos/menuitem.cpp \ ../../src/palmos/menuitem.cpp \
../../src/palmos/metafile.cpp \ ../../src/palmos/metafile.cpp \
../../src/palmos/mimetype.cpp \
../../src/palmos/minifram.cpp \ ../../src/palmos/minifram.cpp \
../../src/palmos/msgdlg.cpp \ ../../src/palmos/msgdlg.cpp \
../../src/palmos/mslu.cpp \
../../src/palmos/nativdlg.cpp \ ../../src/palmos/nativdlg.cpp \
../../src/palmos/notebook.cpp \ ../../src/palmos/notebook.cpp \
../../src/palmos/ownerdrw.cpp \ ../../src/palmos/ownerdrw.cpp \
@@ -254,8 +251,6 @@ SOURCES = ../../samples/minimal/minimal.cpp \
../../src/palmos/radiobut.cpp \ ../../src/palmos/radiobut.cpp \
../../src/palmos/regconf.cpp \ ../../src/palmos/regconf.cpp \
../../src/palmos/region.cpp \ ../../src/palmos/region.cpp \
../../src/palmos/registry.cpp \
../../src/palmos/renderer.cpp \
../../src/palmos/scrolbar.cpp \ ../../src/palmos/scrolbar.cpp \
../../src/palmos/settings.cpp \ ../../src/palmos/settings.cpp \
../../src/palmos/slider.cpp \ ../../src/palmos/slider.cpp \

View File

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

View File

@@ -31,7 +31,7 @@ class WXDLLEXPORT wxWindow;
#include "wx/gdicmn.h" // for wxPoint #include "wx/gdicmn.h" // for wxPoint
// some platforms have their own renderers, others use the generic one // 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 #define wxHAS_NATIVE_RENDERER
#else #else
#undef wxHAS_NATIVE_RENDERER #undef wxHAS_NATIVE_RENDERER

View File

@@ -43,7 +43,7 @@
#include <signal.h> // for SIGTRAP used by wxTrap() #include <signal.h> // for SIGTRAP used by wxTrap()
#endif //Win/Unix #endif //Win/Unix
#if defined(__WXMSW__) && !defined(__WXPALMOS__) #if defined(__WXMSW__)
#include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox()
#endif #endif

View File

@@ -47,8 +47,8 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/ptr_scpd.h" #include "wx/ptr_scpd.h"
#if defined(__WXMSW__) && !defined(__WXPALMOS__) #if defined(__WXMSW__)
#include "wx/msw/private.h" // includes windows.h for LOGFONT #include "wx/msw/private.h" // includes windows.h for LOGFONT
#endif #endif
#if wxUSE_FONTMAP #if wxUSE_FONTMAP

View File

@@ -49,7 +49,7 @@
#include "wx/paper.h" #include "wx/paper.h"
#endif // wxUSE_PRINTING_ARCHITECTURE #endif // wxUSE_PRINTING_ARCHITECTURE
#if defined(__WXMSW__) && !defined(__WXPALMOS__) #if defined(__WXMSW__)
#include <windowsx.h> #include <windowsx.h>
#include "wx/msw/private.h" #include "wx/msw/private.h"

View File

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

View File

@@ -36,7 +36,7 @@
#include "wx/gdicmn.h" #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/private.h" // includes windows.h for LOGFONT
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif

View File

@@ -42,7 +42,7 @@
#include "wx/log.h" #include "wx/log.h"
#include <string.h> #include <string.h>
#if defined(__WXMSW__) && !defined(__WXPALMOS__) #if defined(__WXMSW__)
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#endif #endif

View File

@@ -52,7 +52,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#if defined(__WXMSW__) && !defined(__WXPALMOS__) #if defined(__WXMSW__)
#include "wx/msw/private.h" #include "wx/msw/private.h"
#endif #endif
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -118,7 +118,7 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
out.PrintfV(format, args); out.PrintfV(format, args);
va_end(args); va_end(args);
#if defined(__WXMSW__) && !defined(__WXMICROWIN__) && !defined(__WXPALMOS__) #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
out.Replace(wxT("\t"), wxT(" ")); out.Replace(wxT("\t"), wxT(" "));
out.Replace(wxT("\n"), wxT("\r\n")); out.Replace(wxT("\n"), wxT("\r\n"));
::OutputDebugString(out); ::OutputDebugString(out);

View File

@@ -95,7 +95,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if defined(__WXMSW__) && !defined(__WXPALMOS__) #if defined(__WXMSW__)
#include "wx/msw/private.h" #include "wx/msw/private.h"
#endif #endif