no message

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 8f37ba6ce0540b2b336bebb71e549ed599989e32..772e4cab64323d87f69db182b427ca0ea4dad5dd 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -24,7 +24,7 @@
 #include "wx.h"
 #endif
 
 #include "wx.h"
 #endif
 

-#if USE_BUTTONBAR && USE_TOOLBAR && defined(__WIN95__)
+#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)

 
 #ifndef __GNUWIN32__
 #include "malloc.h"
 
 #ifndef __GNUWIN32__
 #include "malloc.h"


@@ -45,6 +45,31 @@
 #include "wx/app.h"
 #include "wx/msw/private.h"
 
 #include "wx/app.h"
 #include "wx/msw/private.h"
 

+// Styles
+#ifndef TBSTYLE_FLAT
+#define TBSTYLE_LIST            0x1000
+#define TBSTYLE_FLAT            0x0800
+#define TBSTYLE_TRANSPARENT     0x8000
+#endif
+ // use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT
+
+// Messages
+#ifndef TB_GETSTYLE
+#define TB_GETSTYLE             (WM_USER + 57)
+#define TB_SETSTYLE             (WM_USER + 56)
+#endif
+
+/* Hint from a newsgroup for custom flatbar drawing:
+Set the TBSTYLE_CUSTOMERASE style, then handle the
+NM_CUSTOMDRAW message and do your custom drawing.
+*/
+
+#define DEFAULTBITMAPX   16
+#define DEFAULTBITMAPY   15
+#define DEFAULTBUTTONX   24
+#define DEFAULTBUTTONY   24
+#define DEFAULTBARHEIGHT 27
+

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 


@@ -61,9 +86,6 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height);
 
 wxToolBar95::wxToolBar95(void)
 {
 
 wxToolBar95::wxToolBar95(void)
 {

-  m_tilingDirection = wxVERTICAL ;
-  m_rowsOrColumns = 0;
-  m_currentRowsOrColumns = 0;

   m_maxWidth = -1;
   m_maxHeight = -1;
   m_hBitmap = 0;
   m_maxWidth = -1;
   m_maxHeight = -1;
   m_hBitmap = 0;


@@ -72,22 +94,14 @@ wxToolBar95::wxToolBar95(void)
 }
 
 bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
 }
 
 bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,

-            long style, int orientation,
-            int RowsOrColumns, const wxString& name)
+            long style, const wxString& name)

 {
   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
        GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
   m_foregroundColour = *wxBLACK ;
 
 {
   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
        GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
   m_foregroundColour = *wxBLACK ;
 

-  m_defaultForegroundColour = *wxBLACK ;
-  m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
-       GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
-
-  m_tilingDirection = orientation;
-  if (m_tilingDirection == wxHORIZONTAL)
-    wxMessageBox("Sorry, wxToolBar95 under Windows 95 only supports vertical tiling.\nPass the number of rows.", "wxToolBar95 usage", wxOK);
-  m_rowsOrColumns = RowsOrColumns;
-  m_currentRowsOrColumns = 0;
+  if (style & wxTB_VERTICAL)
+    wxMessageBox("Sorry, wxToolBar95 under Windows 95 only supports horizontal orientation.", "wxToolBar95 usage", wxOK);

   m_maxWidth = -1;
   m_maxHeight = -1;
   
   m_maxWidth = -1;
   m_maxHeight = -1;
   


@@ -123,12 +137,19 @@ bool wxToolBar95::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, co
     y = 0;
 
   m_windowId = (id < 0 ? NewControlId() : id);
     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.
 
   // 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.
     x, y, width, height,                    // Standard toolbar size and position.
     (HWND) parent->GetHWND(),                       // Parent window of the toolbar.
     (HMENU)m_windowId,                // Toolbar ID.


@@ -174,7 +195,7 @@ bool wxToolBar95::CreateTools(void)
   
   // Now blit all the tools onto this bitmap
   HDC memoryDC = ::CreateCompatibleDC(NULL);
   
   // Now blit all the tools onto this bitmap
   HDC memoryDC = ::CreateCompatibleDC(NULL);

-  HBITMAP oldBitmap = ::SelectObject(memoryDC, (HBITMAP) m_hBitmap);
+  HBITMAP oldBitmap = (HBITMAP) ::SelectObject(memoryDC, (HBITMAP) m_hBitmap);

 
   HDC memoryDC2 = ::CreateCompatibleDC(NULL);
   int x = 0;
 
   HDC memoryDC2 = ::CreateCompatibleDC(NULL);
   int x = 0;


@@ -187,7 +208,7 @@ bool wxToolBar95::CreateTools(void)
     {
 //      wxPalette *palette = tool->m_bitmap1->GetPalette();
 
     {
 //      wxPalette *palette = tool->m_bitmap1->GetPalette();
 

-      HBITMAP oldBitmap2 = ::SelectObject(memoryDC2, (HBITMAP) tool->m_bitmap1.GetHBITMAP());
+      HBITMAP oldBitmap2 = (HBITMAP) ::SelectObject(memoryDC2, (HBITMAP) tool->m_bitmap1.GetHBITMAP());

       /* int bltResult = */
          BitBlt(memoryDC, x, 0, (int) m_defaultWidth, (int) m_defaultHeight, memoryDC2,
                         0, 0, SRCCOPY);
       /* int bltResult = */
          BitBlt(memoryDC, x, 0, (int) m_defaultWidth, (int) m_defaultHeight, memoryDC2,
                         0, 0, SRCCOPY);


@@ -279,7 +300,7 @@ bool wxToolBar95::CreateTools(void)
   ans = (int)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);
 
   RECT rect;
   ans = (int)::SendMessage((HWND) GetHWND(), TB_AUTOSIZE, (WPARAM)0, (LPARAM) 0);
 
   RECT rect;

-  ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_rowsOrColumns, TRUE), (LPARAM) & rect);
+  ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_maxRows, TRUE), (LPARAM) & rect);

   m_maxWidth = (rect.right - rect.left + 2);
   m_maxHeight = (rect.bottom - rect.top + 2);
 
   m_maxWidth = (rect.right - rect.left + 2);
   m_maxHeight = (rect.bottom - rect.top + 2);
 


@@ -342,7 +363,7 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxToolBar95::SetDefaultSize(const wxSize& size)
+void wxToolBar95::SetToolBitmapSize(const wxSize& size)

 {
   m_defaultWidth = size.x; m_defaultHeight = size.y;
   ::SendMessage((HWND) GetHWND(), TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG ((int)size.x, (int)size.y));
 {
   m_defaultWidth = size.x; m_defaultHeight = size.y;
   ::SendMessage((HWND) GetHWND(), TB_SETBITMAPSIZE, 0, (LPARAM) MAKELONG ((int)size.x, (int)size.y));


@@ -358,10 +379,10 @@ void wxToolBar95::SetRows(int nRows)
 
 wxSize wxToolBar95::GetMaxSize(void) const
 {
 
 wxSize wxToolBar95::GetMaxSize(void) const
 {

-  if (m_maxWidth == -1 | m_maxHeight == -1)
+  if ((m_maxWidth == -1) || (m_maxHeight == -1))

   {
     RECT rect;
   {
     RECT rect;

-    ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_rowsOrColumns, TRUE), (LPARAM) & rect);
+    ::SendMessage((HWND) GetHWND(), TB_SETROWS, MAKEWPARAM(m_maxRows, TRUE), (LPARAM) & rect);

     ((wxToolBar95 *)this)->m_maxWidth = (rect.right - rect.left + 2); // ???
     ((wxToolBar95 *)this)->m_maxHeight = (rect.bottom - rect.top + 2); // ???
   }
     ((wxToolBar95 *)this)->m_maxWidth = (rect.right - rect.left + 2); // ???
     ((wxToolBar95 *)this)->m_maxHeight = (rect.bottom - rect.top + 2); // ???
   }


@@ -377,7 +398,7 @@ void wxToolBar95::GetSize(int *w, int *h) const
 }
 
 // The button size is bigger than the bitmap size
 }
 
 // The button size is bigger than the bitmap size

-wxSize wxToolBar95::GetDefaultButtonSize(void) const
+wxSize wxToolBar95::GetToolSize(void) const

 {
   return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
 }
 {
   return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
 }


@@ -407,6 +428,11 @@ void wxToolBar95::ToggleTool(int toolIndex, bool toggle)
   }
 }
 
   }
 }
 

+bool wxToolBar95::GetToolState(int toolIndex) const
+{
+    return (::SendMessage((HWND) GetHWND(), TB_ISBUTTONCHECKED, (WPARAM)toolIndex, (LPARAM)0) != 0);
+}
+

 void wxToolBar95::ClearTools(void)
 {
   // TODO: Don't know how to reset the toolbar bitmap, as yet.
 void wxToolBar95::ClearTools(void)
 {
   // TODO: Don't know how to reset the toolbar bitmap, as yet.


@@ -421,7 +447,7 @@ void wxToolBar95::ClearTools(void)
 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 *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);
+  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);

   tool->m_clientData = clientData;
 
   if (xPos > -1)
   tool->m_clientData = clientData;
 
   if (xPos > -1)


@@ -445,8 +471,6 @@ void wxToolBar95::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     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)));

-    m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
-           GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));

 
     // Remap the buttons
     CreateTools();
 
     // Remap the buttons
     CreateTools();


@@ -492,7 +516,7 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
 
   if (hdcMem)
   {
 
   if (hdcMem)
   {

-    hbmOld = SelectObject(hdcMem, hBitmap);
+    hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap);

 
     int i, j, k;
     for ( i = 0; i < width; i++)
 
     int i, j, k;
     for ( i = 0; i < width; i++)