BC++ compialtion fix (?)

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 228cc67835076b870f01312eda39b99a06de11c9..5086123d9348f2bc78e95fb32d365ed86aa00b3b 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -190,8 +190,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

-#warning "Please implement this for your system!"
-   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
 }


@@ -277,7 +276,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 

-wxLibraries::wxLibraries()
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)

 {
 }
 
 {
 }
 


@@ -322,13 +321,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;
-    wxStringTokenizer tokenizer(libPath, _T(':'));
+        libPath << wxT(':') << envLibPath;
+    wxStringTokenizer tokenizer(libPath, wxT(':'));

     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 
     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 

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

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