use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 540bd0374b63cba5421d3cedc86efe658007b26e..8b079d463059b41eabdf47e0e7b9ce893f31e581 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -25,11 +25,11 @@
 #include "wx/hashmap.h"
 #include "wx/module.h"
 
 #include "wx/hashmap.h"
 #include "wx/module.h"
 

-class WXDLLIMPEXP_BASE wxPluginLibrary;
+class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;

 
 
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,
 
 
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,

-                                     class WXDLLIMPEXP_BASE)
+                                     class WXDLLIMPEXP_BASE);

 typedef wxDLManifest wxDLImports;
 
 // ---------------------------------------------------------------------------
 typedef wxDLManifest wxDLImports;
 
 // ---------------------------------------------------------------------------


@@ -82,8 +82,8 @@ public:
 
 private:
 
 
 private:
 

-    wxClassInfo    *m_before;       // sm_first before loading this lib
-    wxClassInfo    *m_after;        // ..and after.
+    const wxClassInfo    *m_before; // sm_first before loading this lib
+    const wxClassInfo    *m_after;  // ..and after.

 
     size_t          m_linkcount;    // Ref count of library link calls
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
 
     size_t          m_linkcount;    // Ref count of library link calls
     size_t          m_objcount;     // ..and (pluggable) object instantiations.


@@ -94,7 +94,7 @@ private:
     void    RegisterModules();      // Init any wxModules in the lib.
     void    UnregisterModules();    // Cleanup any wxModules we installed.
 
     void    RegisterModules();      // Init any wxModules in the lib.
     void    UnregisterModules();    // Cleanup any wxModules we installed.
 

-    DECLARE_NO_COPY_CLASS(wxPluginLibrary)
+    wxDECLARE_NO_COPY_CLASS(wxPluginLibrary);

 };
 
 
 };
 
 


@@ -144,7 +144,7 @@ private:
 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.
 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.

-    DECLARE_NO_COPY_CLASS(wxPluginManager)
+    wxDECLARE_NO_COPY_CLASS(wxPluginManager);

 };
 
 
 };