Committed William Osborne's wxPalmOS port

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 13:40:30 +00:00
parent 698b34facd
commit ffecfa5aeb
260 changed files with 40716 additions and 44 deletions
--- 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__)
+#if defined(__WXMSW__) && !defined(__PALMOS__)
    #include "wx/msw/wrapwin.h"
 #endif

@@ -109,7 +109,7 @@ public:

    // set the XFLD
    void SetXFontName(const wxString& xFontName);
-#elif defined(__WXMSW__)
+#elif defined(__WXMSW__) && !defined(__PALMOS__)
    LOGFONT      lf;
 #elif defined(__WXPM__)
    // OS/2 native structures that define a font