1. wxWizard supports setting images for each page, sample updated to show it

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 8ad47c2b837bbc0cb1ede3418e61edf7361e0d1a..876f60c07d21b1471ee27f16c6a0f2ab793b81c9 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -22,6 +22,9 @@
 #endif
 
 #include  "wx/wxprec.h"
 #endif
 
 #include  "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 #ifdef __BORLANDC__
   #pragma hdrstop
 
 #ifdef __BORLANDC__
   #pragma hdrstop


@@ -55,8 +58,6 @@
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-#   include <windows.h>
-

     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
 #      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)


@@ -190,7 +191,7 @@ wxDllLoader::GetProgramHandle(void)
    // shl_findsymbol with NULL handle looks up in main program
    return 0; 
 #else
    // shl_findsymbol with NULL handle looks up in main program
    return 0; 
 #else

-   wxFAIL_MSG(_("This method is not implemented under Windows or OS/2"));
+   wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));

    return 0;
 #endif
 }
    return 0;
 #endif
 }


@@ -321,13 +322,13 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )

-        libPath << ':' << envLibPath;
+        libPath << wxT(':') << envLibPath;

     wxStringTokenizer tokenizer(libPath, wxT(':'));
     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 
     wxStringTokenizer tokenizer(libPath, wxT(':'));
     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 

-        fullname << '/' << libname;
+        fullname << wxT('/') << libname;

         if ( wxFileExists(fullname) )
         {
             libname = fullname;
         if ( wxFileExists(fullname) )
         {
             libname = fullname;