Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 8b3aacdfa26d6a742e9337996ca97668b4ec018f..a08ed217a83ecdf1d6c9c04f2fe3374c127b930c 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -48,7 +48,7 @@
 #elif defined(__WINDOWS__)
 #   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;
 #elif defined(__WINDOWS__)
 #   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;

-#elif defined(__APPLE__) && defined(__UNIX__)
+#elif defined(__DARWIN__)

     typedef void *wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
     typedef void *wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;


@@ -171,7 +171,7 @@ private:
 
     // no copy ctor/assignment operators (or we'd try to unload the library
     // twice)
 
     // no copy ctor/assignment operators (or we'd try to unload the library
     // twice)

-    DECLARE_NO_COPY_CLASS(wxDynamicLibrary);
+    DECLARE_NO_COPY_CLASS(wxDynamicLibrary)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------