Inserted an else that seemed to be missing. (My RadioBox crashed

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 36ebad03d87ade4ab419adfe87cba2608ff60e88..63a64b9f57a67b7774c11020bb0ffeb5d3ec0b9e 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -45,6 +45,13 @@
 #include "wx/app.h"
 #include "wx/msw/private.h"
 
+#ifndef TBSTYLE_FLAT
+#define TBSTYLE_LIST            0x1000
+#define TBSTYLE_FLAT            0x0800
+#define TBSTYLE_TRANSPARENT     0x8000
+#endif
+ // use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 
@@ -71,9 +78,9 @@ wxToolBar95::wxToolBar95(void)
   m_defaultHeight = DEFAULTBITMAPY;
 }
 
-bool wxToolBar95::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const int orientation,
-            const int RowsOrColumns, const wxString& name)
+bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+            long style, int orientation,
+            int RowsOrColumns, const wxString& name)
 {
   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
        GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
@@ -123,12 +130,19 @@ bool wxToolBar95::Create(wxWindow *parent, const wxWindowID id, const wxPoint& p
     y = 0;
 
   m_windowId = (id < 0 ? NewControlId() : id);
+  DWORD msStyle = WS_CHILD | WS_BORDER | WS_VISIBLE | TBSTYLE_TOOLTIPS;
+
+  if (style & wxTB_FLAT)
+  {
+    if (wxTheApp->GetComCtl32Version() > 400)
+        msStyle |= TBSTYLE_FLAT;
+  }
 
   // Create the toolbar control.
   HWND hWndToolbar = CreateWindowEx(0L,   // No extended styles.
     TOOLBARCLASSNAME,                 // Class name for the toolbar.
     "",                               // No default text.
-    WS_CHILD | WS_BORDER | WS_VISIBLE | TBSTYLE_TOOLTIPS,    // Styles and defaults.
+    msStyle,    // Styles and defaults.
     x, y, width, height,                    // Standard toolbar size and position.
     (HWND) parent->GetHWND(),                       // Parent window of the toolbar.
     (HMENU)m_windowId,                // Toolbar ID.
@@ -286,7 +300,7 @@ bool wxToolBar95::CreateTools(void)
   return TRUE;
 }
 
-bool wxToolBar95::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxToolBar95::MSWCommand(WXUINT cmd, WXWORD id)
 {
   wxNode *node = m_tools.Find((long)id);
   if (!node)
@@ -304,7 +318,7 @@ bool wxToolBar95::MSWCommand(const WXUINT cmd, const WXWORD id)
   return TRUE;
 }
 
-bool wxToolBar95::MSWNotify(const WXWPARAM WXUNUSED(wParam), const WXLPARAM lParam)
+bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
 {
        // First check if this applies to us
     NMHDR *hdr = (NMHDR *)lParam;
@@ -348,7 +362,7 @@ void wxToolBar95::SetDefaultSize(const wxSize& size)
   ::SendMessage((HWND) GetHWND(), TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG ((int)size.x, (int)size.y));
 }
 
-void wxToolBar95::SetRows(const int nRows)
+void wxToolBar95::SetRows(int nRows)
 {
   RECT rect;
   ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(nRows, TRUE), (LPARAM) & rect);
@@ -382,7 +396,7 @@ wxSize wxToolBar95::GetDefaultButtonSize(void) const
   return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
 }
 
-void wxToolBar95::EnableTool(const int toolIndex, const bool enable)
+void wxToolBar95::EnableTool(int toolIndex, bool enable)
 {
   wxNode *node = m_tools.Find((long)toolIndex);
   if (node)
@@ -393,7 +407,7 @@ void wxToolBar95::EnableTool(const int toolIndex, const bool enable)
   }
 }
 
-void wxToolBar95::ToggleTool(const int toolIndex, const bool toggle)
+void wxToolBar95::ToggleTool(int toolIndex, bool toggle)
 {
   wxNode *node = m_tools.Find((long)toolIndex);
   if (node)
@@ -418,8 +432,8 @@ void wxToolBar95::ClearTools(void)
 // If pushedBitmap is NULL, a reversed version of bitmap is
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.
-wxToolBarTool *wxToolBar95::AddTool(const int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
-             const bool toggle, const long xPos, const long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
+             bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
 {
   wxToolBarTool *tool = new wxToolBarTool(index, bitmap, (wxBitmap *)NULL, toggle, xPos, yPos, helpString1, helpString2);
   tool->m_clientData = clientData;