added WX_FORWARD_STD_METHODS_TO_SUBWINDOWS macro

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 8b8ce1d2922bf0257f67a60ae4335a33f5bd300b..e953735ab7b88d2660c4fa1b02a078cb90f14432 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -5,24 +5,27 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

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

+#include "wx/defs.h"
+

 #if wxUSE_COLOURDLG
 
 #if wxUSE_COLOURDLG
 

-#if defined(__WXMSW__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

     #include "wx/msw/colordlg.h"
     #include "wx/msw/colordlg.h"

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)

     #include "wx/mac/colordlg.h"
     #include "wx/mac/colordlg.h"

+#elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk/colordlg.h"

 #else
     #include "wx/generic/colrdlgg.h"
 
     #define wxColourDialog wxGenericColourDialog
 #else
     #include "wx/generic/colrdlgg.h"
 
     #define wxColourDialog wxGenericColourDialog

-    #define sm_classwxColourDialog sm_classwxGenericColourDialog

 #endif
 
 // get the colour from user and return it
 #endif
 
 // get the colour from user and return it