Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 0ff6b1a46d288b4f54ac17db36cabb6ead13d9eb..b4914567c0ca12bbe6005ab53a3a28700fe5e50d 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -242,7 +242,11 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 // global functions
 // ---------------------------------------------------------------------------
 
 // global functions
 // ---------------------------------------------------------------------------
 

+extern "C"
+{

 WXDLLEXPORT HINSTANCE wxGetInstance();
 WXDLLEXPORT HINSTANCE wxGetInstance();

+}
+

 WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);