activating DrawRectangle optimization

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index a5f60686cf23abb8b4916c126fdceec2b0f23fb5..6a704d7eb66278822f580f88f3051020bd0ea2b4 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -123,14 +123,14 @@ enum wxPluginCategory
 #define wxDL_INIT_FUNC(pfx, name, dynlib) \
     pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name)
 
 #define wxDL_INIT_FUNC(pfx, name, dynlib) \
     pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name)
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 // same as wxDL_INIT_FUNC() but appends 'A' or 'W' to the function name, see
 // wxDynamicLibrary::GetSymbolAorW()
 #define wxDL_INIT_FUNC_AW(pfx, name, dynlib) \
     pfx ## name = (name ## _t)(dynlib).GetSymbolAorW(#name)
 
 
 // same as wxDL_INIT_FUNC() but appends 'A' or 'W' to the function name, see
 // wxDynamicLibrary::GetSymbolAorW()
 #define wxDL_INIT_FUNC_AW(pfx, name, dynlib) \
     pfx ## name = (name ## _t)(dynlib).GetSymbolAorW(#name)
 

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
 // the following macros can be used to redirect a whole library to a class and
 // check at run-time if the library is present and contains all required
 
 // the following macros can be used to redirect a whole library to a class and
 // check at run-time if the library is present and contains all required


@@ -304,7 +304,7 @@ public:
 #endif
     }
 
 #endif
     }
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     // this function is useful for loading functions from the standard Windows
     // DLLs: such functions have an 'A' (in ANSI build) or 'W' (in Unicode, or
     // wide character build) suffix if they take string parameters
     // this function is useful for loading functions from the standard Windows
     // DLLs: such functions have an 'A' (in ANSI build) or 'W' (in Unicode, or
     // wide character build) suffix if they take string parameters


@@ -326,7 +326,7 @@ public:
     {
         return RawGetSymbolAorW(m_handle, name);
     }
     {
         return RawGetSymbolAorW(m_handle, name);
     }

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
     // return all modules/shared libraries in the address space of this process
     //
 
     // return all modules/shared libraries in the address space of this process
     //


@@ -349,7 +349,7 @@ public:
     static wxString GetPluginsDirectory();
 
 
     static wxString GetPluginsDirectory();
 
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     // return the handle (HMODULE/HINSTANCE) of the DLL with the given name
     // and/or containing the specified address: for XP and later systems only
     // the address is used and the name is ignored but for the previous systems
     // return the handle (HMODULE/HINSTANCE) of the DLL with the given name
     // and/or containing the specified address: for XP and later systems only
     // the address is used and the name is ignored but for the previous systems


@@ -360,7 +360,7 @@ public:
     // need to be freed using FreeLibrary() but it also means that it can
     // become invalid if the DLL is unloaded
     static WXHMODULE MSWGetModuleHandle(const char *name, void *addr);
     // need to be freed using FreeLibrary() but it also means that it can
     // become invalid if the DLL is unloaded
     static WXHMODULE MSWGetModuleHandle(const char *name, void *addr);

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
 protected:
     // common part of GetSymbol() and HasSymbol()
 
 protected:
     // common part of GetSymbol() and HasSymbol()


@@ -383,7 +383,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary);
 };
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 // ----------------------------------------------------------------------------
 // wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind
 
 // ----------------------------------------------------------------------------
 // wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind


@@ -404,7 +404,7 @@ public:
     }
 };
 
     }
 };
 

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
 // ----------------------------------------------------------------------------
 // Interesting defines
 
 // ----------------------------------------------------------------------------
 // Interesting defines