X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4a8c29f7a3ffa7eb60d9b7f055565eb2df368d9..a6e2157322eedc8142be3a24cb3fe26eb1e8a0e8:/include/wx/dynlib.h

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index cebc563b7e..ceecce4a58 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -10,6 +10,10 @@
 #include <wx/dynarray.h>
 #include <wx/hash.h>
 
+#ifdef LoadLibrary
+#undef LoadLibrary
+#endif
+
 // ---------------------------------------------------------------------------
 // wxLibrary
 
@@ -35,7 +39,7 @@ class wxLibrary: public wxObject {
   void MergeWithSystem();
 
  protected:
-  void PrepareClasses(wxClassInfo **first);
+  void PrepareClasses(wxClassInfo *first);
 };
 
 // ---------------------------------------------------------------------------
@@ -61,9 +65,9 @@ extern wxLibraries wxTheLibraries;
 // Interesting defines
 
 #define WXDLL_ENTRY_FUNCTION() \
-extern "C" wxClassInfo **wxGetClassFirst(); \
-wxClassInfo **wxGetClassFirst() { \
-  return &wxClassInfo::first; \
+extern "C" wxClassInfo *wxGetClassFirst(); \
+wxClassInfo *wxGetClassFirst() { \
+  return wxClassInfo::GetFirst(); \
 }
 
 #endif