removed HandleSysCommand() and don't generate duplicate events for frame maximization...

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 3af9bfe8e85eac631de58addf1a319f054c452f7..d439d680f41b111378113d6a43582dcdc29d9259 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tbar95.h"
 #endif
 
     #pragma implementation "tbar95.h"
 #endif
 


@@ -39,35 +39,18 @@
     #include "wx/control.h"
 #endif
 
     #include "wx/control.h"
 #endif
 

-#if wxUSE_TOOLBAR && defined(__WIN95__) && wxUSE_TOOLBAR_NATIVE
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && defined(WIN32_PLATFORM_WFSP)))

 
 #include "wx/toolbar.h"
 
 #include "wx/toolbar.h"

-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-    #include "malloc.h"
-#endif
+#include "wx/sysopt.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#else
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 #include "wx/app.h"         // for GetComCtl32Version
 
 
 #include "wx/app.h"         // for GetComCtl32Version
 

-#if defined(__MWERKS__) && defined(__WXMSW__)
-// including <windef.h> for max definition doesn't seem
-// to work using CodeWarrior 6 Windows. So we define it
-// here. (Otherwise we get a undefined identifier 'max'
-// later on in this file.) (Added by dimitri@shortcut.nl)
-#   ifndef max
-#       define max(a,b)            (((a) > (b)) ? (a) : (b))
-#   endif
-
-#endif
-

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -121,7 +104,26 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+/*
+       TOOLBAR PROPERTIES
+               tool
+                       bitmap
+                       bitmap2
+                       tooltip
+                       longhelp
+                       radio (bool)
+                       toggle (bool)
+               separator
+               style ( wxNO_BORDER | wxTB_HORIZONTAL)
+               bitmapsize
+               margins
+               packing
+               separation
+
+               dontattachtoframe
+*/

 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)


@@ -176,6 +178,8 @@ public:
 
 private:
     size_t m_nSepCount;
 
 private:
     size_t m_nSepCount;

+
+    DECLARE_NO_COPY_CLASS(wxToolBarTool)

 };
 
 
 };
 
 


@@ -236,6 +240,8 @@ bool wxToolBar::Create(wxWindow *parent,
     if ( !MSWCreateToolbar(pos, size) )
         return FALSE;
 
     if ( !MSWCreateToolbar(pos, size) )
         return FALSE;
 

+    wxSetCCUnicodeFormat(GetHwnd());
+

     // set up the colors and fonts
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     // set up the colors and fonts
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));


@@ -245,7 +251,7 @@ bool wxToolBar::Create(wxWindow *parent,
 
 bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
 {
 
 bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
 {

-    if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size) )
+    if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )

         return FALSE;
 
     // toolbar-specific post initialisation
         return FALSE;
 
     // toolbar-specific post initialisation


@@ -278,7 +284,7 @@ void wxToolBar::Recreate()
     }
 
     // reparent all our children under the new toolbar
     }
 
     // reparent all our children under the new toolbar

-    for ( wxWindowList::Node *node = m_children.GetFirst();
+    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -340,7 +346,7 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     // do have tooltips wouldn't work
     msStyle |= TBSTYLE_TOOLTIPS;
 
     // do have tooltips wouldn't work
     msStyle |= TBSTYLE_TOOLTIPS;
 

-    if ( style & wxTB_FLAT )
+    if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )

     {
         // static as it doesn't change during the program lifetime
         static int s_verComCtl = wxTheApp->GetComCtl32Version();
     {
         // static as it doesn't change during the program lifetime
         static int s_verComCtl = wxTheApp->GetComCtl32Version();


@@ -353,6 +359,11 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
         {
             msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }
         {
             msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }

+
+        if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
+        {
+            msStyle |= TBSTYLE_LIST;
+        }

     }
 
     if ( style & wxTB_NODIVIDER )
     }
 
     if ( style & wxTB_NODIVIDER )


@@ -361,6 +372,9 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( style & wxTB_NOALIGN )
         msStyle |= CCS_NOPARENTALIGN;
 
     if ( style & wxTB_NOALIGN )
         msStyle |= CCS_NOPARENTALIGN;
 

+    if ( style & wxTB_VERTICAL )
+        msStyle |= CCS_VERT;
+

     return msStyle;
 }
 
     return msStyle;
 }
 


@@ -386,7 +400,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     // first determine the position of the first button to delete: it may be
     // different from pos if we use several separators to cover the space used
     // by a control
     // first determine the position of the first button to delete: it may be
     // different from pos if we use several separators to cover the space used
     // by a control

-    wxToolBarToolsList::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;

     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool2 = node->GetData();
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool2 = node->GetData();


@@ -477,7 +491,7 @@ bool wxToolBar::Realize()
     // First, add the bitmap: we use one bitmap for all toolbar buttons
     // ----------------------------------------------------------------
 
     // First, add the bitmap: we use one bitmap for all toolbar buttons
     // ----------------------------------------------------------------
 

-    wxToolBarToolsList::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;

     int bitmapId = 0;
 
     wxSize sizeBmp;
     int bitmapId = 0;
 
     wxSize sizeBmp;


@@ -528,6 +542,22 @@ bool wxToolBar::Realize()
         MemoryHDC memoryDC2;
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
         MemoryHDC memoryDC2;
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 

+        if (wxSystemOptions::HasOption(wxT("msw.remap")) && wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 0)
+        {
+#if USE_BITMAP_MASKS
+            dcAllButtons.SelectObject(wxNullBitmap);
+#endif
+
+            // Even if we're not remapping the bitmap
+            // content, we still have to remap the background.
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+
+#if USE_BITMAP_MASKS
+            dcAllButtons.SelectObject(bitmap);
+#endif
+        }
+

         // the button position
         wxCoord x = 0;
 
         // the button position
         wxCoord x = 0;
 


@@ -542,13 +572,15 @@ bool wxToolBar::Realize()
                 const wxBitmap& bmp = tool->GetNormalBitmap();
                 if ( bmp.Ok() )
                 {
                 const wxBitmap& bmp = tool->GetNormalBitmap();
                 if ( bmp.Ok() )
                 {

+                    int xOffset = wxMax(0, (m_defaultWidth - bmp.GetWidth())/2);
+                    int yOffset = wxMax(0, (m_defaultHeight - bmp.GetHeight())/2);

 #if USE_BITMAP_MASKS
                     // notice the last parameter: do use mask
 #if USE_BITMAP_MASKS
                     // notice the last parameter: do use mask

-                    dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);
+                    dcAllButtons.DrawBitmap(bmp, x+xOffset, yOffset, TRUE);

 #else // !USE_BITMAP_MASKS
                     SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp));
                     if ( !BitBlt(memoryDC,
 #else // !USE_BITMAP_MASKS
                     SelectInHDC hdcSelector2(memoryDC2, GetHbitmapOf(bmp));
                     if ( !BitBlt(memoryDC,

-                                 x, 0,  m_defaultWidth, m_defaultHeight,
+                                 x+xOffset, yOffset,  m_defaultWidth, m_defaultHeight,

                                  memoryDC2,
                                  0, 0, SRCCOPY) )
                     {
                                  memoryDC2,
                                  0, 0, SRCCOPY) )
                     {


@@ -576,9 +608,12 @@ bool wxToolBar::Realize()
         bitmap.SetHBITMAP(0);
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
         bitmap.SetHBITMAP(0);
 #endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 

-        // Map to system colours
-        hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                                     totalBitmapWidth, totalBitmapHeight);
+        if (!wxSystemOptions::HasOption(wxT("msw.remap")) || wxSystemOptions::GetOptionInt(wxT("msw.remap")) == 1)
+        {
+            // Map to system colours
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+        }

 
         bool addBitmap = TRUE;
 
 
         bool addBitmap = TRUE;
 


@@ -651,9 +686,14 @@ bool wxToolBar::Realize()
     {
         wxToolBarToolBase *tool = node->GetData();
 
     {
         wxToolBarToolBase *tool = node->GetData();
 

-        // don't add separators to the vertical toolbar - looks ugly
-        if ( isVertical && tool->IsSeparator() )
+        // don't add separators to the vertical toolbar with old comctl32.dll
+        // versions as they didn't handle this properly
+        if ( isVertical && tool->IsSeparator() &&
+                wxTheApp->GetComCtl32Version() <= 472 )
+        {

             continue;
             continue;

+        }
+

 
         TBBUTTON& button = buttons[i];
 
 
         TBBUTTON& button = buttons[i];
 


@@ -779,7 +819,7 @@ bool wxToolBar::Realize()
         int left = -1;
 
         // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
         int left = -1;
 
         // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+

-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+#ifdef TB_SETBUTTONINFO

         // available in headers, now check whether it is available now
         // (during run-time)
         if ( wxTheApp->GetComCtl32Version() >= 471 )
         // available in headers, now check whether it is available now
         // (during run-time)
         if ( wxTheApp->GetComCtl32Version() >= 471 )


@@ -895,28 +935,30 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
     if ( !tool )
         return FALSE;
 
     if ( !tool )
         return FALSE;
 

+    bool toggled = false; // just to suppress warnings
+

     if ( tool->CanBeToggled() )
     {
         LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
     if ( tool->CanBeToggled() )
     {
         LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);

-        tool->Toggle((state & TBSTATE_CHECKED) != 0);
-    }
+        toggled = (state & TBSTATE_CHECKED) != 0;
+
+        // ignore the event when a radio button is released, as this doesn't seem to
+        // happen at all, and is handled otherwise
+        if ( tool->GetKind() == wxITEM_RADIO && !toggled )
+            return TRUE;

 
 

-    bool toggled = tool->IsToggled();
+        tool->Toggle(toggled);
+        UnToggleRadioGroup(tool);
+    }

 
 

-    // avoid sending the event when a radio button is released, this is not
-    // interesting
-    if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
+    // OnLeftClick() can veto the button state change - for buttons which
+    // may be toggled only, of couse
+    if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )

     {
     {

-        // OnLeftClick() can veto the button state change - for buttons which
-        // may be toggled only, of couse
-        if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
-        {
-            // revert back
-            toggled = !toggled;
-            tool->SetToggle(toggled);
+        // revert back
+        tool->Toggle(!toggled);

 
 

-            ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));
-        }
+        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -989,7 +1031,8 @@ wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \

-    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !defined (__DIGITALMARS__)

     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);


@@ -1008,7 +1051,7 @@ static
 wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
                                                size_t index )
 {
 wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
                                                size_t index )
 {

-    wxToolBarToolsList::Node* current = tools.GetFirst();
+    wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();

 
     for ( ; current != 0; current = current->GetNext() )
     {
 
     for ( ; current != 0; current = current->GetNext() )
     {


@@ -1160,9 +1203,9 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
+bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)

 {
 {

-    // calculate our minor dimenstion ourselves - we're confusing the standard
+    // calculate our minor dimension ourselves - we're confusing the standard

     // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
     RECT r;
     if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
     // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
     RECT r;
     if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )


@@ -1187,12 +1230,8 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
                 h = r.bottom - r.top;
             if ( m_maxRows )
             {
                 h = r.bottom - r.top;
             if ( m_maxRows )
             {

-                // FIXME: 6 is hardcoded separator line height...
-                //h += 6;
-                if (HasFlag(wxTB_NODIVIDER))
-                    h += 4;
-                else
-                    h += 6;
+                // FIXME: hardcoded separator line height...
+                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;

                 h *= m_maxRows;
             }
         }
                 h *= m_maxRows;
             }
         }


@@ -1216,7 +1255,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
     // any here
 
     // first of all, do we have any controls at all?
     // any here
 
     // first of all, do we have any controls at all?

-    wxToolBarToolsList::Node *node;
+    wxToolBarToolsList::compatibility_iterator node;

     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         if ( node->GetData()->IsControl() )
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         if ( node->GetData()->IsControl() )


@@ -1298,6 +1337,10 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
                 {
                     // yes, do erase it!
                     dc.DrawRectangle(rectItem);
                 {
                     // yes, do erase it!
                     dc.DrawRectangle(rectItem);

+                    
+                    // Necessary in case we use a no-paint-on-size
+                    // style in the parent: the controls can disappear
+                    control->Refresh(FALSE);

                 }
             }
         }
                 }
             }
         }


@@ -1306,7 +1349,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxToolBar::HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam)
+void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)

 {
     wxCoord x = GET_X_LPARAM(lParam),
             y = GET_Y_LPARAM(lParam);
 {
     wxCoord x = GET_X_LPARAM(lParam),
             y = GET_Y_LPARAM(lParam);


@@ -1327,7 +1370,7 @@ void wxToolBar::HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam)
     }
 }
 
     }
 }
 

-long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
     switch ( nMsg )
     {
 {
     switch ( nMsg )
     {