Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/colordlg.cpp b/src/palmos/colordlg.cpp
index 59b60aa22857fbff4fb93a834a0d7073863b6f5c..8de8b5746b30efd6bb5b34ffddcde9e069a9112e 100644 (file)
--- a/src/palmos/colordlg.cpp
+++ b/src/palmos/colordlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,15 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_COLOURDLG
+
+#include "wx/colordlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/intl.h"
 #endif
 
     #include "wx/intl.h"
 #endif
 

-#if wxUSE_COLOURDLG
-
-#include "wx/cmndata.h"
-#include "wx/colordlg.h"
+#include <UIColor.h>
+#include <UIControls.h>

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros