Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now

compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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)
@@ -220,4 +223,4 @@ class WXDLLEXPORT wxPageSetupData: public wxObject
 
 
 #endif
-    // __CMNDATAH_BASE__
+    // _WX_CMNDATA_H_BASE_