avoid a bug in Carbon headers

[wxWidgets.git] / include / wx / univ / theme.h

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index 97831c741ee5735aba72aad2017d0de43abed63c..ac22a2c6be83ffbb0b2a47a4d077e345ab4ec852 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -8,13 +8,13 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_THEME_H_
 #define _WX_UNIV_THEME_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_THEME_H_
 #define _WX_UNIV_THEME_H_
 

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

     #pragma interface "theme.h"
 #endif
 
     #pragma interface "theme.h"
 #endif
 


@@ -25,6 +25,7 @@
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxColourScheme;
 class WXDLLEXPORT wxInputHandler;
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxColourScheme;
 class WXDLLEXPORT wxInputHandler;

+class WXDLLEXPORT wxArtProvider;

 struct WXDLLEXPORT wxThemeInfo;
 
 class WXDLLEXPORT wxTheme
 struct WXDLLEXPORT wxThemeInfo;
 
 class WXDLLEXPORT wxTheme


@@ -51,6 +52,9 @@ public:
     // get the renderer implementing all the control-drawing operations in
     // this theme
     virtual wxRenderer *GetRenderer() = 0;
     // get the renderer implementing all the control-drawing operations in
     // this theme
     virtual wxRenderer *GetRenderer() = 0;

+    
+    // get the art provider to be used together with this theme
+    virtual wxArtProvider *GetArtProvider() = 0;

 
     // get the input handler of the given type
     virtual wxInputHandler *GetInputHandler(const wxString& handlerType) = 0;
 
     // get the input handler of the given type
     virtual wxInputHandler *GetInputHandler(const wxString& handlerType) = 0;