Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 24338b06b5dddc42ee2f220c32aa879b14bbd772..578d5262241d44f05fa9a618e5754bdff148db15 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -6,7 +6,7 @@
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_BASE_


@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "controlbase.h"
 #endif
 
     #pragma interface "controlbase.h"
 #endif
 


@@ -82,10 +82,10 @@ protected:
     #include "wx/gtk/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
     #include "wx/gtk/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/control.h"

 #elif defined(__WXPM__)
     #include "wx/os2/control.h"
 #elif defined(__WXPM__)
     #include "wx/os2/control.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/control.h"

 #endif
 
 #endif // wxUSE_CONTROLS
 #endif
 
 #endif // wxUSE_CONTROLS