more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 8bcc8b4d352249b1872ae844a2801f82526ec9d6..64aeb305cbacd694b73850d5721bcb9482feac79 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DYNLIB_H__
 #define _WX_DYNLIB_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#   pragma interface "dynlib.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_DYNLIB_CLASS
@@ -23,10 +19,8 @@
 #include "wx/string.h"
 #include "wx/dynarray.h"
 
-// FIXME: can this go in private.h or something too??
 #if defined(__WXPM__) || defined(__EMX__)
-#define INCL_DOS
-#include <os2.h>
+#include "wx/os2/private.h"
 #endif
 
 #ifdef __WXMSW__
@@ -247,9 +241,33 @@ public:
 #endif
     }
 
+#ifdef __WXMSW__
+    // 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
+    static void *RawGetSymbolAorW(wxDllType handle, const wxString& name)
+    {
+        return RawGetSymbol
+               (
+                handle,
+                name + 
+#if wxUSE_UNICODE
+                L'W'
+#else
+                'A'
+#endif
+               );
+    }
+
+    void *GetSymbolAorW(const wxString& name) const
+    {
+        return RawGetSymbolAorW(m_handle, name);
+    }
+#endif // __WXMSW__
+
     // return all modules/shared libraries in the address space of this process
     //
-    // returns an empty array if not implemented or an error occured
+    // returns an empty array if not implemented or an error occurred
     static wxDynamicLibraryDetailsArray ListLoaded();
 
     // return platform-specific name of dynamic library with proper extension
@@ -300,6 +318,8 @@ protected:
 
 #if WXWIN_COMPATIBILITY_2_2 && wxUSE_DYNAMIC_LOADER
 
+#include "wx/object.h"
+
 /*
     wxDllLoader is a class providing an interface similar to unix's dlopen().
     It is used by wxDynamicLibrary wxLibrary and manages the actual loading of