Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index d654a927aebc859e1ca08685b94d4bf4cb00f1a2..3197404bd4d8062a91d502f2e9daf9c10e8f86f7 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -8,7 +8,7 @@
 // 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:     wxWidgets licence
+// Licence:     wxWindows licence

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


@@ -52,7 +52,7 @@ 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 art provider to be used together with this theme
     virtual wxArtProvider *GetArtProvider() = 0;
 


@@ -105,10 +105,10 @@ struct WXDLLEXPORT wxThemeInfo
 // without it, an over optimizing linker may discard the object module
 // containing the theme implementation entirely
 #define WX_USE_THEME(themename)                                             \
 // without it, an over optimizing linker may discard the object module
 // containing the theme implementation entirely
 #define WX_USE_THEME(themename)                                             \

-    WXDLLEXPORT_DATA(extern bool) wxThemeUse##themename;                    \
+    extern WXDLLEXPORT_DATA(bool) wxThemeUse##themename;                    \

     static struct wxThemeUserFor##themename                                 \
     {                                                                       \
     static struct wxThemeUserFor##themename                                 \
     {                                                                       \

-        wxThemeUserFor##themename() { wxThemeUse##themename = TRUE; }       \
+        wxThemeUserFor##themename() { wxThemeUse##themename = true; }       \

     } wxThemeDoUse##themename
 
 // to declare a new theme, this macro must be used in the class declaration
     } wxThemeDoUse##themename
 
 // to declare a new theme, this macro must be used in the class declaration


@@ -121,7 +121,7 @@ struct WXDLLEXPORT wxThemeInfo
 
 // and this one must be inserted in the source file
 #define WX_IMPLEMENT_THEME(classname, themename, themedesc)                 \
 
 // and this one must be inserted in the source file
 #define WX_IMPLEMENT_THEME(classname, themename, themedesc)                 \

-    WXDLLEXPORT_DATA(bool) wxThemeUse##themename = TRUE;                    \
+    WXDLLEXPORT_DATA(bool) wxThemeUse##themename = true;                    \

     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
                                               wxT( #themename ), themedesc)
     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
                                               wxT( #themename ), themedesc)