Unicode fixes

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

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index db66e05e73daa7d60bb440588d82486db29c0b15..4ac923829496044d6ec078faaa639f28a962082e 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -31,7 +31,7 @@ wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL;
 XrmDatabase wxResourceDatabase;
 
 /* Useful buffer, initialized in wxCommonInit */
 XrmDatabase wxResourceDatabase;
 
 /* Useful buffer, initialized in wxCommonInit */

-char *wxBuffer = (char *) NULL;
+wxChar *wxBuffer = (wxChar *) NULL;

 
 /* Windows List */
 wxWindowList wxTopLevelWindows;
 
 /* Windows List */
 wxWindowList wxTopLevelWindows;

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index fdd1f25e8f8b234cee7562f72024c90509b32ecb..4349abe3486bcc338cfc6993a3df4f1faefdb77e 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -401,7 +401,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__

-        wxLogDebug("Drop target: drag has format: %s", format.GetId().c_str() );
+        wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() );

 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))
 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 7b40f4ccbea4bb90353206055d76b99cadb5977a..77cc2b8fe5f299f112f1436ee59ef10ff453a14c 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -165,7 +165,7 @@ void wxSpinCtrl::SetValue( const wxString& value )
     else
     {
         // invalid number - set text as is (wxMSW compatible)
     else
     {
         // invalid number - set text as is (wxMSW compatible)

-        gtk_entry_set_text( GTK_ENTRY(m_widget), value.c_str() );
+        gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );

     }
 }
 
     }
 }
 

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index db66e05e73daa7d60bb440588d82486db29c0b15..4ac923829496044d6ec078faaa639f28a962082e 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -31,7 +31,7 @@ wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL;
 XrmDatabase wxResourceDatabase;
 
 /* Useful buffer, initialized in wxCommonInit */
 XrmDatabase wxResourceDatabase;
 
 /* Useful buffer, initialized in wxCommonInit */

-char *wxBuffer = (char *) NULL;
+wxChar *wxBuffer = (wxChar *) NULL;

 
 /* Windows List */
 wxWindowList wxTopLevelWindows;
 
 /* Windows List */
 wxWindowList wxTopLevelWindows;

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index fdd1f25e8f8b234cee7562f72024c90509b32ecb..4349abe3486bcc338cfc6993a3df4f1faefdb77e 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -401,7 +401,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__

-        wxLogDebug("Drop target: drag has format: %s", format.GetId().c_str() );
+        wxLogDebug( wxT("Drop target: drag has format: %s"), format.GetId().c_str() );

 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))
 #endif // Debug
 
         if (m_dataObject->IsSupportedFormat( format ))

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 7b40f4ccbea4bb90353206055d76b99cadb5977a..77cc2b8fe5f299f112f1436ee59ef10ff453a14c 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -165,7 +165,7 @@ void wxSpinCtrl::SetValue( const wxString& value )
     else
     {
         // invalid number - set text as is (wxMSW compatible)
     else
     {
         // invalid number - set text as is (wxMSW compatible)

-        gtk_entry_set_text( GTK_ENTRY(m_widget), value.c_str() );
+        gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );

     }
 }
 
     }
 }
 

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 5d149d8c245eeca3b6dca88a65c08512ccd4f51f..fb16e317bbcf61136868a551b39309284ea5a37f 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -212,7 +212,7 @@ public:
       { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
 
    virtual void Notify()
       { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
 
    virtual void Notify()

-      { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
+      { wxLogTrace(wxT("Checking dial up network status.")); m_dupman->CheckStatus(); }

 
    virtual void Stop()
       { if ( m_started ) wxTimer::Stop(); }
 
    virtual void Stop()
       { if ( m_started ) wxTimer::Stop(); }


@@ -281,7 +281,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;
    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;

-   if(m_ConnectCommand.Find("%s"))
+   if(m_ConnectCommand.Find(wxT("%s")))

       cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
    else
       cmd = m_ConnectCommand;
       cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
    else
       cmd = m_ConnectCommand;


@@ -315,7 +315,7 @@ wxDialUpManagerImpl::HangUp(void)
    }
    m_IsOnline = -1;
    wxString cmd;
    }
    m_IsOnline = -1;
    wxString cmd;

-   if(m_HangUpCommand.Find("%s"))
+   if(m_HangUpCommand.Find(wxT("%s")))

       cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);
    else
       cmd = m_HangUpCommand;
       cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);
    else
       cmd = m_HangUpCommand;


@@ -361,11 +361,11 @@ void
 wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 {
    /// does hostname contain a port number?
 wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 {
    /// does hostname contain a port number?

-   wxString port = hostname.After(':');
+   wxString port = hostname.After(wxT(':'));

    if(port.Length())
    {
    if(port.Length())
    {

-      m_BeaconHost = hostname.Before(':');
-      m_BeaconPort = atoi(port);
+      m_BeaconHost = hostname.Before(wxT(':'));
+      m_BeaconPort = wxAtoi(port);

    }
    else
    {
    }
    else
    {


@@ -470,7 +470,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    struct sockaddr_in  serv_addr;
 
    m_IsOnline = 0; // assume false
    struct sockaddr_in  serv_addr;
 
    m_IsOnline = 0; // assume false

-   if((hp = gethostbyname(m_BeaconHost)) == NULL)
+   if((hp = gethostbyname(m_BeaconHost.mb_str())) == NULL)

       return; // no DNS no net
    
    serv_addr.sin_family                = hp->h_addrtype;
       return; // no DNS no net
    
    serv_addr.sin_family                = hp->h_addrtype;

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index fdc00b91422ed147845829ca2c16cfdef894f378..fceeff6ca240a10627776c4878179ac7700f20ca 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -62,7 +62,7 @@ static char **CreateFontList(wxChar spacing, int *nFonts)
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-*-*"), spacing);
 
     // get the list of all fonts
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-*-*"), spacing);
 
     // get the list of all fonts

-    return XListFonts((Display *)wxGetDisplay(), pattern, 32767, nFonts);
+    return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts);

 }
 
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 }
 
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,


@@ -74,7 +74,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];

-        if ( !wxString(font).Matches("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
+        if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )

         {
             // it's not a full font name (probably an alias)
             continue;
         {
             // it's not a full font name (probably an alias)
             continue;


@@ -84,16 +84,17 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
         char *family = dash + 1;
         dash = strchr(family, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded
         char *family = dash + 1;
         dash = strchr(family, '-');
         *dash = '\0'; // !NULL because Matches() above succeeded

+        wxString fam(family);

 
 

-        if ( families.Index(family) == wxNOT_FOUND )
+        if ( families.Index(fam) == wxNOT_FOUND )

         {
         {

-            if ( !This->OnFontFamily(family) )
+            if ( !This->OnFontFamily(fam) )

             {
                 // stop enumerating
                 return FALSE;
             }
 
             {
                 // stop enumerating
                 return FALSE;
             }
 

-            families.Add(family);
+            families.Add(fam);

         }
         //else: already seen
     }
         }
         //else: already seen
     }


@@ -159,7 +160,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     // get the list of all fonts
     int nFonts;
 
     // get the list of all fonts
     int nFonts;

-    char **fonts = XListFonts((Display *)wxGetDisplay(), pattern,
+    char **fonts = XListFonts((Display *)wxGetDisplay(), pattern.mb_str(),

                               32767, &nFonts);
 
     if ( !fonts )
                               32767, &nFonts);
 
     if ( !fonts )


@@ -173,7 +174,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];
     for ( int n = 0; n < nFonts; n++ )
     {
         char *font = fonts[n];

-        if ( !wxString(font).Matches("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
+        if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )

         {
             // it's not a full font name (probably an alias)
             continue;
         {
             // it's not a full font name (probably an alias)
             continue;