1. corrected (but the fix is ugly) the multiple def button problem

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 2cf8e00d613939fb2c32d00b41667a9f0651ed20..c3b57815e59a381cc687c541c80c70c0ae6ff0af 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -32,15 +32,17 @@
 
 #include <windows.h>
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/tbar95.h"
@@ -77,10 +79,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 +101,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." );
+                wxT("Sorry, wxToolBar95 under Windows 95 only "
+                   "supports horizontal orientation.") );
 
   m_maxWidth = -1;
   m_maxHeight = -1;
@@ -164,7 +165,7 @@ bool wxToolBar95::Create(wxWindow *parent,
                      (
                       exStyle,                  // Extended styles.
                       TOOLBARCLASSNAME,         // Class name for the toolbar.
-                      "",                       // No default text.
+                      wxT(""),                   // No default text.
                       msflags,                  // Styles
                       x, y, width, height,      // Standard toolbar size and position.
                       (HWND) parent->GetHWND(), // Parent window of the toolbar.
@@ -173,7 +174,7 @@ bool wxToolBar95::Create(wxWindow *parent,
                       NULL                      // No class data.
                      );
 
-  wxCHECK_MSG( hWndToolbar, FALSE, "Toolbar creation failed" );
+  wxCHECK_MSG( hWndToolbar, FALSE, wxT("Toolbar creation failed") );
 
   // Toolbar-specific initialisation
   ::SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE,
@@ -255,7 +256,9 @@ bool wxToolBar95::CreateTools()
     replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap;
     replaceBitmap.nButtons = noButtons;
     if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1)
-      wxMessageBox("Could not add bitmap to toolbar");
+    {
+      wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
+    }
 
     ::DeleteObject((HBITMAP) oldToolBarBitmap);
 
@@ -274,7 +277,9 @@ bool wxToolBar95::CreateTools()
     addBitmap.hInst = 0;
     addBitmap.nID = (UINT)m_hBitmap;
     if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1)
-      wxMessageBox("Could not add bitmap to toolbar");
+    {
+      wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
+    }
   }
 
   // Now add the buttons.
@@ -319,7 +324,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, wxT("failed to add buttons to the toolbar") );
 
   (void)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);
 
@@ -346,7 +351,7 @@ bool wxToolBar95::MSWCommand(WXUINT cmd, WXWORD id)
   return TRUE;
 }
 
-bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
+bool wxToolBar95::MSWOnNotify(int WXUNUSED(idCtrl),
                             WXLPARAM lParam,
                             WXLPARAM *result)
 {
@@ -355,7 +360,8 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
 
     // the tooltips control created by the toolbar is sometimes Unicode, even in
     // an ANSI application
-    if ( (hdr->code != TTN_NEEDTEXTA) && (hdr->code != TTN_NEEDTEXTW) )
+    int code = (int)hdr->code;
+    if ( (code != TTN_NEEDTEXTA) && (code != TTN_NEEDTEXTW) )
         return FALSE;
 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
@@ -370,28 +376,37 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
 
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
 
-    if ( tool->m_shortHelpString != "" )
+    const wxString& help = tool->m_shortHelpString;
+
+    if ( !help.IsEmpty() )
     {
-        if ( hdr->code == TTN_NEEDTEXTA )
+        if ( code == TTN_NEEDTEXTA )
         {
-            ttText->lpszText = (char *)(const char *)tool->m_shortHelpString;
+            ttText->lpszText = (wxChar *)help.c_str();
         }
 #if (_WIN32_IE >= 0x0300)
         else
         {
             // FIXME this is a temp hack only until I understand better what
             //       must be done in both ANSI and Unicode builds
-            size_t lenAnsi = tool->m_shortHelpString.Len();
+
+            size_t lenAnsi = help.Len();
             #ifdef __MWERKS__
-            wchar_t *pwz = new wchar_t[lenAnsi * 2 + 1];
+                // MetroWerks doesn't like calling mbstowcs with NULL argument
+                size_t lenUnicode = 2*lenAnsi;
             #else
-            size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi);
-            wchar_t *pwz = new wchar_t[lenUnicode + 1];
+                size_t lenUnicode = mbstowcs(NULL, help, lenAnsi);
             #endif
-            mbstowcs(pwz, tool->m_shortHelpString, lenAnsi + 1);
-            memcpy(ttText->szText, pwz,
-                   (sizeof(ttText->szText) - 1)/sizeof(ttText->szText[0]));
-            ttText->szText[WXSIZEOF(ttText->szText)] = 0;
+
+            // using the pointer of right type avoids us doing all sorts of
+            // pointer arithmetics ourselves
+            wchar_t *dst = (wchar_t *)ttText->szText,
+                    *pwz = new wchar_t[lenUnicode + 1];
+            mbstowcs(pwz, help, lenAnsi + 1);
+            memcpy(dst, pwz, lenUnicode*sizeof(wchar_t));
+
+            // put the terminating _wide_ NUL
+            dst[lenUnicode] = 0;
 
             delete [] pwz;
         }
@@ -431,15 +446,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
 {
@@ -518,8 +524,6 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
     // Remap the buttons
     CreateTools();
 
-    Default();
-
     Refresh();
 
     // Propagate the event to the non-top-level children
@@ -536,7 +540,7 @@ void wxToolBar95::OnMouseEvent(wxMouseEvent& event)
     }
     else
     {
-        Default();
+        event.Skip();
     }
 }