Added wxPoem sample; fixed some Dialog Editor problems; wxStaticBitmap and wxBitmapButton

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index abb8c5da514808aa6132c7e3fd5f0c3fb2bcebe5..dc4eeb3ee03a3b47ecd2c8fa626307c4a3adcfd2 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -9,13 +9,16 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CMNDATAH_BASE__
-#define __CMNDATAH_BASE__
+#ifndef _WX_CMNDATA_H_BASE_
+#define _WX_CMNDATA_H_BASE_
 
 #ifdef __GNUG__
 #pragma interface "cmndata.h"
 #endif
 
+#include "wx/font.h"
+#include "wx/colour.h"
+
 class WXDLLEXPORT wxColourData: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxColourData)
@@ -82,7 +85,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
   DECLARE_DYNAMIC_CLASS(wxPrintData)
 
  public:
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   void *printData;
 #endif
   int printFromPage;
@@ -137,7 +140,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
 
   void operator=(const wxPrintData& data);
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   // Convert to/from the PRINTDLG structure
   void ConvertToNative(void);
   void ConvertFromNative(void);
@@ -220,4 +223,4 @@ class WXDLLEXPORT wxPageSetupData: public wxObject
 
 
 #endif
-    // __CMNDATAH_BASE__
+    // _WX_CMNDATA_H_BASE_