an assert added to check that we're not doing something stupid

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index fb02e9d4b8b79248c4754e6145e02f5ab6bc6964..6a9fcc6cfa8312b3f8942be7352391883d4ff963 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -77,10 +77,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
-    EVT_SIZE(wxToolBar95::OnSize)
-    EVT_PAINT(wxToolBar95::OnPaint)
     EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
-    EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
     EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
 END_EVENT_TABLE()
 
@@ -102,14 +99,16 @@ bool wxToolBar95::Create(wxWindow *parent,
                          long style,
                          const wxString& name)
 {
+  m_hWnd = 0;
+
   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
                                 GetGValue(GetSysColor(COLOR_BTNFACE)),
                                 GetBValue(GetSysColor(COLOR_BTNFACE)));
   m_foregroundColour = *wxBLACK ;
 
   wxASSERT_MSG( (style & wxTB_VERTICAL) == 0,
-                "Sorry, wxToolBar95 under Windows 95 only "
-                "supports horizontal orientation." );
+                _T("Sorry, wxToolBar95 under Windows 95 only "
+                   "supports horizontal orientation.") );
 
   m_maxWidth = -1;
   m_maxHeight = -1;
@@ -164,7 +163,7 @@ bool wxToolBar95::Create(wxWindow *parent,
                      (
                       exStyle,                  // Extended styles.
                       TOOLBARCLASSNAME,         // Class name for the toolbar.
-                      "",                       // No default text.
+                      _T(""),                   // No default text.
                       msflags,                  // Styles
                       x, y, width, height,      // Standard toolbar size and position.
                       (HWND) parent->GetHWND(), // Parent window of the toolbar.
@@ -173,7 +172,7 @@ bool wxToolBar95::Create(wxWindow *parent,
                       NULL                      // No class data.
                      );
 
-  wxCHECK_MSG( hWndToolbar, FALSE, "Toolbar creation failed" );
+  wxCHECK_MSG( hWndToolbar, FALSE, _T("Toolbar creation failed") );
 
   // Toolbar-specific initialisation
   ::SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE,
@@ -255,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)
-      wxFAIL_MSG("Could not add bitmap to toolbar");
+    {
+      wxFAIL_MSG(_T("Could not add bitmap to toolbar"));
+    }
 
     ::DeleteObject((HBITMAP) oldToolBarBitmap);
 
@@ -274,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)
-      wxFAIL_MSG("Could not add bitmap to toolbar");
+    {
+      wxFAIL_MSG(_T("Could not add bitmap to toolbar"));
+    }
   }
 
   // Now add the buttons.
@@ -319,7 +322,7 @@ bool wxToolBar95::CreateTools()
 
   long rc = ::SendMessage((HWND) GetHWND(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)& buttons);
 
-  wxCHECK_MSG( rc, FALSE, "failed to add buttons to the toolbar" );
+  wxCHECK_MSG( rc, FALSE, _T("failed to add buttons to the toolbar") );
 
   (void)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);
 
@@ -376,7 +379,7 @@ bool wxToolBar95::MSWOnNotify(int WXUNUSED(idCtrl),
     {
         if ( hdr->code == TTN_NEEDTEXTA )
         {
-            ttText->lpszText = (char *)help.c_str();
+            ttText->lpszText = (wxChar *)help.c_str();
         }
 #if (_WIN32_IE >= 0x0300)
         else
@@ -440,15 +443,6 @@ wxSize wxToolBar95::GetMaxSize() const
   return wxSize(m_maxWidth, m_maxHeight);
 }
 
-void wxToolBar95::GetSize(int *w, int *h) const
-{
-  wxWindow::GetSize(w, h);
-  // For some reason, the returned height is several pixels bigger than that
-  // displayed!
-  // Taking this fudge factor out now, it seems fine without it.
-//  *h -= 2;
-}
-
 // The button size is bigger than the bitmap size
 wxSize wxToolBar95::GetToolSize() const
 {
@@ -527,8 +521,6 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
     // Remap the buttons
     CreateTools();
 
-    Default();
-
     Refresh();
 
     // Propagate the event to the non-top-level children
@@ -545,7 +537,7 @@ void wxToolBar95::OnMouseEvent(wxMouseEvent& event)
     }
     else
     {
-        Default();
+        event.Skip();
     }
 }