Include wx/window.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index d091e383e1a234a2c1819744fc2d554f331453e1..16ccaa00b37a7d1979821f058d46092feaea8cde 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/tbar95.cpp
+// Name:        src/msw/tbar95.cpp

 // Purpose:     wxToolBar
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxToolBar
 // Author:      Julian Smart
 // Modified by:


@@ -24,19 +24,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/dynarray.h"

     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-    #include "wx/dynarray.h"

     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"

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

 #endif
 
 #endif
 

-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
-

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


@@ -50,7 +51,14 @@
 // include <commctrl.h> "properly"
 #include "wx/msw/wrapcctl.h"
 
 // include <commctrl.h> "properly"
 #include "wx/msw/wrapcctl.h"
 

-#include "wx/app.h"         // for GetComCtl32Version
+// this define controls whether the code for button colours remapping (only
+// useful for 16 or 256 colour images) is active at all, it's always turned off
+// for CE where it doesn't compile (and is probably not needed anyhow) and may
+// also be turned off for other systems if you always use 24bpp images and so
+// never need it
+#ifndef __WXWINCE__
+    #define wxREMAP_BUTTON_COLOURS
+#endif // !__WXWINCE__

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -234,10 +242,6 @@ bool wxToolBar::Create(wxWindow *parent,
 
     wxSetCCUnicodeFormat(GetHwnd());
 
 
     wxSetCCUnicodeFormat(GetHwnd());
 

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

     // workaround for flat toolbar on Windows XP classic style: we have to set
     // the style after creating the control; doing it at creation time doesn't work
 #if wxUSE_UXTHEME
     // workaround for flat toolbar on Windows XP classic style: we have to set
     // the style after creating the control; doing it at creation time doesn't work
 #if wxUSE_UXTHEME


@@ -315,7 +319,6 @@ void wxToolBar::Recreate()
     }
 
     Realize();
     }
 
     Realize();

-    UpdateSize();

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()


@@ -460,6 +463,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     {
         nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
         width *= nButtonsToDelete;
     {
         nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
         width *= nButtonsToDelete;

+        tool->GetControl()->Destroy();

     }
 
     // do delete all buttons
     }
 
     // do delete all buttons


@@ -539,21 +543,27 @@ bool wxToolBar::Realize()
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 
 
     const bool isVertical = HasFlag(wxTB_VERTICAL);
 

-    bool doRemap, doRemapBg, doTransparent;
-    doRemapBg = doRemap = doTransparent = false;
-
-#ifndef __WXWINCE__
-    int remapValue = (-1);
-    if (wxSystemOptions::HasOption(wxT("msw.remap")))
-        remapValue = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
-
-    doTransparent = (remapValue == 2);
-    if (!doTransparent)
+#ifdef wxREMAP_BUTTON_COLOURS
+    // don't change the values of these constants, they can be set from the
+    // user code via wxSystemOptions
+    enum

     {
     {

-        doRemap = (remapValue != 0);
-        doRemapBg = !doRemap;
-    }
-#endif
+        Remap_None = -1,
+        Remap_Bg,
+        Remap_Buttons,
+        Remap_TransparentBg
+    };
+
+    // the user-specified option overrides anything, but if it wasn't set, only
+    // remap the buttons on 8bpp displays as otherwise the bitmaps usually look
+    // much worse after remapping
+    static const wxChar *remapOption = wxT("msw.remap");
+    const int remapValue = wxSystemOptions::HasOption(remapOption)
+                                ? wxSystemOptions::GetOptionInt(remapOption)
+                                : wxDisplayDepth() <= 8 ? Remap_Buttons
+                                                        : Remap_None;
+
+#endif // wxREMAP_BUTTON_COLOURS

 
     // delete all old buttons, if any
     for ( size_t pos = 0; pos < m_nButtons; pos++ )
 
     // delete all old buttons, if any
     for ( size_t pos = 0; pos < m_nButtons; pos++ )


@@ -590,26 +600,31 @@ bool wxToolBar::Realize()
                                           wx_truncate_cast(wxCoord, nTools),
                       totalBitmapHeight = m_defaultHeight;
 
                                           wx_truncate_cast(wxCoord, nTools),
                       totalBitmapHeight = m_defaultHeight;
 

-        // Create a bitmap and copy all the tool bitmaps to it
+        // Create a bitmap and copy all the tool bitmaps into it

         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);
 
         wxMemoryDC dcAllButtons;
         wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
         dcAllButtons.SelectObject(bitmap);
 

-#ifndef __WXWINCE__
-        if (doTransparent)
-            dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
-        else
-            dcAllButtons.SetBackground(wxBrush(GetBackgroundColour()));
-#else
-        dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
-#endif
-        dcAllButtons.Clear();
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue != Remap_TransparentBg )
+#endif // wxREMAP_BUTTON_COLOURS
+        {
+            // VZ: why do we hardcode grey colour for CE?
+            dcAllButtons.SetBackground(wxBrush(
+#ifdef __WXWINCE__
+                                        wxColour(0xc0, 0xc0, 0xc0)
+#else // !__WXWINCE__
+                                        GetBackgroundColour()
+#endif // __WXWINCE__/!__WXWINCE__
+                                       ));
+            dcAllButtons.Clear();
+        }

 
         m_hBitmap = bitmap.GetHBITMAP();
         HBITMAP hBitmap = (HBITMAP)m_hBitmap;
 
 
         m_hBitmap = bitmap.GetHBITMAP();
         HBITMAP hBitmap = (HBITMAP)m_hBitmap;
 

-#ifndef __WXWINCE__
-        if (doRemapBg)
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue == Remap_Bg )

         {
             dcAllButtons.SelectObject(wxNullBitmap);
 
         {
             dcAllButtons.SelectObject(wxNullBitmap);
 


@@ -620,7 +635,7 @@ bool wxToolBar::Realize()
 
             dcAllButtons.SelectObject(bitmap);
         }
 
             dcAllButtons.SelectObject(bitmap);
         }

-#endif // !__WXWINCE__
+#endif // wxREMAP_BUTTON_COLOURS

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


@@ -656,7 +671,7 @@ bool wxToolBar::Realize()
                 if ( m_disabledImgList )
                 {
                     wxBitmap bmpDisabled = tool->GetDisabledBitmap();
                 if ( m_disabledImgList )
                 {
                     wxBitmap bmpDisabled = tool->GetDisabledBitmap();

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && wxUSE_WXDIB

                     if ( !bmpDisabled.Ok() )
                     {
                         // no disabled bitmap specified but we still need to
                     if ( !bmpDisabled.Ok() )
                     {
                         // no disabled bitmap specified but we still need to


@@ -665,7 +680,8 @@ bool wxToolBar::Realize()
                         wxImage imgGreyed;
                         wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
 
                         wxImage imgGreyed;
                         wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
 

-                        if (doRemap)
+#ifdef wxREMAP_BUTTON_COLOURS
+                        if ( remapValue == Remap_Buttons )

                         {
                             // we need to have light grey background colour for
                             // MapBitmap() to work correctly
                         {
                             // we need to have light grey background colour for
                             // MapBitmap() to work correctly


@@ -681,13 +697,16 @@ bool wxToolBar::Realize()
                                 }
                             }
                         }
                                 }
                             }
                         }

+#endif // wxREMAP_BUTTON_COLOURS

 
                         bmpDisabled = wxBitmap(imgGreyed);
                     }
 #endif // wxUSE_IMAGE
 
 
                         bmpDisabled = wxBitmap(imgGreyed);
                     }
 #endif // wxUSE_IMAGE
 

-                    if (doRemap)
+#ifdef wxREMAP_BUTTON_COLOURS
+                    if ( remapValue == Remap_Buttons )

                         MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
                         MapBitmap(bmpDisabled.GetHBITMAP(), w, h);

+#endif // wxREMAP_BUTTON_COLOURS

 
                     m_disabledImgList->Add(bmpDisabled);
                 }
 
                     m_disabledImgList->Add(bmpDisabled);
                 }


@@ -705,12 +724,14 @@ bool wxToolBar::Realize()
         // don't delete this HBITMAP!
         bitmap.SetHBITMAP(0);
 
         // don't delete this HBITMAP!
         bitmap.SetHBITMAP(0);
 

-        if (doRemap)
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue == Remap_Buttons )

         {
             // Map to system colours
             hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
         {
             // Map to system colours
             hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,

-                totalBitmapWidth, totalBitmapHeight);
+                                         totalBitmapWidth, totalBitmapHeight);

         }
         }

+#endif // wxREMAP_BUTTON_COLOURS

 
         bool addBitmap = true;
 
 
         bool addBitmap = true;
 


@@ -1049,7 +1070,7 @@ bool wxToolBar::Realize()
     }
 
     InvalidateBestSize();
     }
 
     InvalidateBestSize();

-    SetBestFittingSize();
+    UpdateSize();

 
     return true;
 }
 
     return true;
 }


@@ -1230,13 +1251,21 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 
 void wxToolBar::UpdateSize()
 {
 
 void wxToolBar::UpdateSize()
 {

-    // the toolbar size changed
+    wxPoint pos = GetPosition();

     ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
     ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);

-
-    // we must also refresh the frame after the toolbar size (possibly) changed
+    if (pos != GetPosition())
+        Move(pos);
+
+    // In case Realize is called after the initial display (IOW the programmer
+    // may have rebuilt the toolbar) give the frame the option of resizing the
+    // toolbar to full width again, but only if the parent is a frame and the
+    // toolbar is managed by the frame.  Otherwise assume that some other
+    // layout mechanism is controlling the toolbar size and leave it alone.

     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

-    if ( frame )
+    if ( frame && frame->GetToolBar() == this )
+    {

         frame->SendSizeEvent();
         frame->SendSizeEvent();

+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1323,7 +1352,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
     if ( event.RightDown() )
     {
         // find the tool under the mouse
     if ( event.RightDown() )
     {
         // find the tool under the mouse

-        wxCoord x,y;
+        wxCoord x = 0, y = 0;

         event.GetPosition(&x, &y);
 
         wxToolBarToolBase *tool = FindToolForPosition(x, y);
         event.GetPosition(&x, &y);
 
         wxToolBarToolBase *tool = FindToolForPosition(x, y);


@@ -1339,34 +1368,48 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 // colour: for example, when it must blend in with a notebook page.
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {
 // colour: for example, when it must blend in with a notebook page.
 void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 {

-    wxColour bgCol = GetBackgroundColour();
-    if (!bgCol.Ok())
-    {
-        event.Skip();
-        return;
-    }
-
-    // notice that this 'dumb' implementation may cause flicker for some of the
-    // controls in which case they should intercept wxEraseEvent and process it
-    // themselves somehow
-
-    RECT rect;
-    ::GetClientRect(GetHwnd(), &rect);
-
-    HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(bgCol));
-
+    RECT rect = wxGetClientRect(GetHwnd());

     HDC hdc = GetHdcOf((*event.GetDC()));
 
     HDC hdc = GetHdcOf((*event.GetDC()));
 

-#ifndef __WXWINCE__
-    int mode = ::SetMapMode(hdc, MM_TEXT);
-#endif
+    if ( UseBgCol() )
+    {
+        // do draw our background
+        //
+        // notice that this 'dumb' implementation may cause flicker for some of
+        // the controls in which case they should intercept wxEraseEvent and
+        // process it themselves somehow
+        AutoHBRUSH hBrush(wxColourToRGB(GetBackgroundColour()));

 
 

-    ::FillRect(hdc, &rect, hBrush);
-    ::DeleteObject(hBrush);
+        wxCHANGE_HDC_MAP_MODE(hdc, MM_TEXT);
+        ::FillRect(hdc, &rect, hBrush);
+    }
+    else // we have no non default background colour
+    {
+#if wxUSE_UXTHEME
+        // we may need to draw themed colour so that we appear correctly on
+        // e.g. notebook page under XP with themes but only do it if the parent
+        // draws themed background itself
+        if ( !GetParent()->UseBgCol() )
+        {
+            wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+            if ( theme )
+            {
+                HRESULT
+                    hr = theme->DrawThemeParentBackground(GetHwnd(), hdc, &rect);
+                if ( hr == S_OK )
+                    return;
+
+                // it can also return S_FALSE which seems to simply say that it
+                // didn't draw anything but no error really occurred
+                if ( FAILED(hr) )
+                    wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+            }
+        }
+#endif // wxUSE_UXTHEME

 
 

-#ifndef __WXWINCE__
-    ::SetMapMode(hdc, mode);
-#endif
+        event.Skip();
+        return;
+    }

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


@@ -1564,6 +1607,8 @@ WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

+#ifdef wxREMAP_BUTTON_COLOURS
+

 WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 {
     MemoryHDC hdcMem;
 WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 {
     MemoryHDC hdcMem;


@@ -1599,7 +1644,8 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
                      abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
                      abs(GetBValue(pixel) - GetBValue(col)) < 10 )
                 {
                      abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
                      abs(GetBValue(pixel) - GetBValue(col)) < 10 )
                 {

-                    ::SetPixel(hdcMem, i, j, cmap[k].to);
+                    if ( cmap[k].to != pixel )
+                        ::SetPixel(hdcMem, i, j, cmap[k].to);

                     break;
                 }
             }
                     break;
                 }
             }


@@ -1607,68 +1653,8 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
     }
 
     return bitmap;
     }
 
     return bitmap;

-
-    // VZ: I leave here my attempts to map the bitmap to the system colours
-    //     faster by using BitBlt() even though it's broken currently - but
-    //     maybe someone else can finish it? It should be faster than iterating
-    //     over all pixels...
-#if 0
-    MemoryHDC hdcMask, hdcDst;
-    if ( !hdcMask || !hdcDst )
-    {
-        wxLogLastError(_T("CreateCompatibleDC"));
-
-        return bitmap;
-    }
-
-    // create the target bitmap
-    HBITMAP hbmpDst = ::CreateCompatibleBitmap(hdcDst, width, height);
-    if ( !hbmpDst )
-    {
-        wxLogLastError(_T("CreateCompatibleBitmap"));
-
-        return bitmap;
-    }
-
-    // create the monochrome mask bitmap
-    HBITMAP hbmpMask = ::CreateBitmap(width, height, 1, 1, 0);
-    if ( !hbmpMask )
-    {
-        wxLogLastError(_T("CreateBitmap(mono)"));
-
-        ::DeleteObject(hbmpDst);
-
-        return bitmap;
-    }
-
-    SelectInHDC bmpInDst(hdcDst, hbmpDst),
-                bmpInMask(hdcMask, hbmpMask);
-
-    // for each colour:
-    for ( n = 0; n < NUM_OF_MAPPED_COLOURS; n++ )
-    {
-        // create the mask for this colour
-        ::SetBkColor(hdcMem, ColorMap[n].from);
-        ::BitBlt(hdcMask, 0, 0, width, height, hdcMem, 0, 0, SRCCOPY);
-
-        // replace this colour with the target one in the dst bitmap
-        HBRUSH hbr = ::CreateSolidBrush(ColorMap[n].to);
-        HGDIOBJ hbrOld = ::SelectObject(hdcDst, hbr);
-
-        ::MaskBlt(hdcDst, 0, 0, width, height,
-                  hdcMem, 0, 0,
-                  hbmpMask, 0, 0,
-                  MAKEROP4(PATCOPY, SRCCOPY));
-
-        (void)::SelectObject(hdcDst, hbrOld);
-        ::DeleteObject(hbr);
-    }
-
-    ::DeleteObject((HBITMAP)bitmap);
-
-    return (WXHBITMAP)hbmpDst;
-#endif // 0

 }
 
 }
 

-#endif // wxUSE_TOOLBAR
+#endif // wxREMAP_BUTTON_COLOURS

 
 

+#endif // wxUSE_TOOLBAR