Fixed inability to select no superscript and no subscript in wxRichTextCtrl's

[wxWidgets.git] / src / msw / dlmsw.cpp

diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index 39830797dc2e31407fdcaac24f88f12481c590c6..280dab0e281bdf5976cff8e0702f20b161285ff8 100644 (file)
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -194,7 +194,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const
     wxString ver;
     if ( m_dll.IsLoaded() )
     {
     wxString ver;
     if ( m_dll.IsLoaded() )
     {

-        wxChar *pc = wx_const_cast(wxChar *, filename.wx_str());
+        wxChar *pc = const_cast<wxChar *>((const wxChar*) filename.t_str());

 
         DWORD dummy;
         DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy);
 
         DWORD dummy;
         DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy);


@@ -205,7 +205,10 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const
             {
                 void *pVer;
                 UINT sizeInfo;
             {
                 void *pVer;
                 UINT sizeInfo;

-                if ( m_pfnVerQueryValue(buf.data(), _T("\\"), &pVer, &sizeInfo) )
+                if ( m_pfnVerQueryValue(buf.data(),
+                                        const_cast<wxChar *>(_T("\\")),
+                                        &pVer,
+                                        &sizeInfo) )

                 {
                     VS_FIXEDFILEINFO *info = (VS_FIXEDFILEINFO *)pVer;
                     ver.Printf(_T("%d.%d.%d.%d"),
                 {
                     VS_FIXEDFILEINFO *info = (VS_FIXEDFILEINFO *)pVer;
                     ver.Printf(_T("%d.%d.%d.%d"),


@@ -239,11 +242,11 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(NameStr_t name,
 
     // fill in simple properties
     details->m_name = wxString::FromAscii(name);
 
     // fill in simple properties
     details->m_name = wxString::FromAscii(name);

-    details->m_address = wx_reinterpret_cast(void *, base);
+    details->m_address = wxUIntToPtr(base);

     details->m_length = size;
 
     // to get the version, we first need the full path
     details->m_length = size;
 
     // to get the version, we first need the full path

-    HMODULE hmod = wxGetModuleHandle(name, (void *)base);
+    HMODULE hmod = wxGetModuleHandle(name, details->m_address);

     if ( hmod )
     {
         wxString fullname = wxGetFullModuleName(hmod);
     if ( hmod )
     {
         wxString fullname = wxGetFullModuleName(hmod);


@@ -279,9 +282,11 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
 
 /* static */
 wxDllType
 
 /* static */
 wxDllType

-wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags))
+wxDynamicLibrary::RawLoad(const wxString& libname, int flags)

 {
 {

-    return ::LoadLibrary(libname.wx_str());
+    return flags & wxDL_GET_LOADED
+            ? ::GetModuleHandle(libname.t_str())
+            : ::LoadLibrary(libname.t_str());

 }
 
 /* static */
 }
 
 /* static */