check that wxString is valid before dumping it

[wxWidgets.git] / src / os2 / toolbar.cpp

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 56ab55267781c55d6a6e077bfe7e1f86d5c40299..def07d219204641cfa5ee8247d0eb7b72b3c3672 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -366,7 +366,7 @@ bool wxToolBar::Create(
         wxClientDC                  vDC(this);
 
         vDC.SetFont(GetFont());
         wxClientDC                  vDC(this);
 
         vDC.SetFont(GetFont());

-        vDC.GetTextExtent( "XXXX"
+        vDC.GetTextExtent( wxT("XXXX")

                           ,&m_vTextX
                           ,&m_vTextY
                          );
                           ,&m_vTextX
                           ,&m_vTextY
                          );


@@ -858,7 +858,7 @@ void wxToolBar::DrawTool(
         LowerTool(pTool, FALSE);
         if (!pTool->IsEnabled())
         {
         LowerTool(pTool, FALSE);
         if (!pTool->IsEnabled())
         {

-            wxColour                vColor("GREY");
+            wxColour                vColor(wxT("GREY"));

 
             rDc.SetTextForeground(vColor);
             if (!pTool->GetDisabledBitmap().Ok())
 
             rDc.SetTextForeground(vColor);
             if (!pTool->GetDisabledBitmap().Ok())


@@ -873,7 +873,7 @@ void wxToolBar::DrawTool(
         }
         else
         {
         }
         else
         {

-            wxColour                vColor("BLACK");
+            wxColour                vColor(wxT("BLACK"));

 
             rDc.SetTextForeground(vColor);
             rDc.DrawBitmap( vBitmap
 
             rDc.SetTextForeground(vColor);
             rDc.DrawBitmap( vBitmap


@@ -918,7 +918,7 @@ void wxToolBar::DrawTool(
     }
     else
     {
     }
     else
     {

-        wxColour                    vColor("GREY");
+        wxColour                    vColor(wxT("GREY"));

 
         LowerTool(pTool);
         rDc.SetTextForeground(vColor);
 
         LowerTool(pTool);
         rDc.SetTextForeground(vColor);


@@ -1072,7 +1072,7 @@ void wxToolBar::LowerTool (
                                                  ,1
                                                  ,wxSOLID
                                                 );
                                                  ,1
                                                  ,wxSOLID
                                                 );

-    wxPen                           vWhitePen( "WHITE"
+    wxPen                           vWhitePen( wxT("WHITE")

                                               ,1
                                               ,wxSOLID
                                              );
                                               ,1
                                               ,wxSOLID
                                              );


@@ -1149,7 +1149,7 @@ void wxToolBar::RaiseTool (
                                                  ,1
                                                  ,wxSOLID
                                                 );
                                                  ,1
                                                  ,wxSOLID
                                                 );

-    wxPen                           vWhitePen( "WHITE"
+    wxPen                           vWhitePen( wxT("WHITE")

                                               ,1
                                               ,wxSOLID
                                              );
                                               ,1
                                               ,wxSOLID
                                              );