disabled wxMBConv(wxFONTENCODING_UTF7) test -- it doesn't work under Unix with iconv()

[wxWidgets.git] / include / wx / palmos / colordlg.h

diff --git a/include/wx/palmos/colordlg.h b/include/wx/palmos/colordlg.h
index b598e0f306b213c1330d309bf6242fea3920a878..d215250f9920703ff1701b9b3721627c61ac02af 100644 (file)
--- a/include/wx/palmos/colordlg.h
+++ b/include/wx/palmos/colordlg.h
@@ -1,22 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/colordlg.h
 // Purpose:     wxColourDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/colordlg.h
 // Purpose:     wxColourDialog class

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Wlodzimierz ABX Skiba - real native implementation

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id:
-// Copyright:   (c) William Osborne
+// RCS-ID:      $Id$
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"