wxGetOsVersion() compilation andl inking fixes for wxMac

[wxWidgets.git] / src / palmos / colordlg.cpp

diff --git a/src/palmos/colordlg.cpp b/src/palmos/colordlg.cpp
index 8c988dafbcfa10ecc970a68137a93aa59835b2a9..5c27e3d23a43c24e5dc67a62a5ef74589471e3d7 100644 (file)
--- a/src/palmos/colordlg.cpp
+++ b/src/palmos/colordlg.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/colordlg.cpp
 // Purpose:     wxColourDialog class
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "colordlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,15 +24,17 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_COLOURDLG
+
+#include "wx/colordlg.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/intl.h"
+    #include "wx/cmndata.h"
 #endif
 
-#if wxUSE_COLOURDLG
-
-#include "wx/cmndata.h"
-#include "wx/colordlg.h"
+#include <UIColor.h>
+#include <UIControls.h>
 
 // ----------------------------------------------------------------------------
 // wxWin macros