Unicode fixes

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index aef9105c825ae4b4acd87be79d956e69b60465b3..6a9fcc6cfa8312b3f8942be7352391883d4ff963 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -99,6 +99,8 @@ bool wxToolBar95::Create(wxWindow *parent,
                          long style,
                          const wxString& name)
 {
                          long style,
                          const wxString& name)
 {

+  m_hWnd = 0;
+

   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
                                 GetGValue(GetSysColor(COLOR_BTNFACE)),
                                 GetBValue(GetSysColor(COLOR_BTNFACE)));
   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
                                 GetGValue(GetSysColor(COLOR_BTNFACE)),
                                 GetBValue(GetSysColor(COLOR_BTNFACE)));


@@ -252,7 +254,9 @@ bool wxToolBar95::CreateTools()
     replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap;
     replaceBitmap.nButtons = noButtons;
     if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1)
     replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap;
     replaceBitmap.nButtons = noButtons;
     if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1)

+    {

       wxFAIL_MSG(_T("Could not add bitmap to toolbar"));
       wxFAIL_MSG(_T("Could not add bitmap to toolbar"));

+    }

 
     ::DeleteObject((HBITMAP) oldToolBarBitmap);
 
 
     ::DeleteObject((HBITMAP) oldToolBarBitmap);
 


@@ -271,7 +275,9 @@ bool wxToolBar95::CreateTools()
     addBitmap.hInst = 0;
     addBitmap.nID = (UINT)m_hBitmap;
     if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1)
     addBitmap.hInst = 0;
     addBitmap.nID = (UINT)m_hBitmap;
     if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1)

+    {

       wxFAIL_MSG(_T("Could not add bitmap to toolbar"));
       wxFAIL_MSG(_T("Could not add bitmap to toolbar"));

+    }

   }
 
   // Now add the buttons.
   }
 
   // Now add the buttons.