X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..32a87ae7b59f6a7087eeb43d176083c5366eb4df:/src/msw/tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index dfaccbbdc9..7d209cc801 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -50,10 +50,10 @@
 
 #ifndef __TWIN32__
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#else
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
+#else
+    #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #endif // __TWIN32__
@@ -214,6 +214,9 @@ bool wxToolBar::Create(wxWindow *parent,
     if (style & wxBORDER)
         msflags |= WS_BORDER;
 
+   if ( style & wxCLIP_SIBLINGS )
+        msflags |= WS_CLIPSIBLINGS;
+
 #ifdef TBSTYLE_TOOLTIPS
     msflags |= TBSTYLE_TOOLTIPS;
 #endif
@@ -853,7 +856,8 @@ void wxToolBar::SetRows(int nRows)
 wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 )
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
@@ -926,9 +930,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
 // Responds to colour changes, and passes event on to children.
 void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
-                                  GetGValue(GetSysColor(COLOR_BTNFACE)),
-                                  GetBValue(GetSysColor(COLOR_BTNFACE)));
+    wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
 
     // Remap the buttons
     Realize();
@@ -1008,19 +1010,6 @@ long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 // private functions
 // ----------------------------------------------------------------------------
 
-// These are the default colors used to map the bitmap colors to the current
-// system colors. Note that they are in BGR format because this is what Windows
-// wants (and not RGB)
-
-/*
-#define BGR_BUTTONTEXT      (RGB(000,000,000))  // black
-#define BGR_BUTTONSHADOW    (RGB(128,128,128))  // dark grey
-#define BGR_BUTTONFACE      (RGB(192,192,192))  // bright grey
-#define BGR_BUTTONHILIGHT   (RGB(255,255,255))  // white
-#define BGR_BACKGROUNDSEL   (RGB(000,000,255))  // blue
-#define BGR_BACKGROUND      (RGB(255,000,255))  // magenta
-*/
-
 bool wxToolBar::sm_coloursInit = FALSE;
 long wxToolBar::sm_stdColours[6];
 
@@ -1069,20 +1058,7 @@ void wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
     //  ColorMap[4].from = sm_stdColours[4]; ColorMap[4].to = COLOR_HIGHLIGHT;  // blue         (0, 0, 255)
     ColorMap[4].from = sm_stdColours[5]; ColorMap[4].to = COLOR_WINDOW;       // magenta      (255, 0, 255)
 
-#if 0
-    {
-        {BGR_BUTTONTEXT,    COLOR_BTNTEXT},     // black
-        {BGR_BUTTONSHADOW,  COLOR_BTNSHADOW},   // dark grey
-        {BGR_BUTTONFACE,    COLOR_BTNFACE},     // bright grey
-        {BGR_BUTTONHILIGHT, COLOR_BTNHIGHLIGHT},// white
-        /*    {BGR_BACKGROUNDSEL, COLOR_HIGHLIGHT},   // blue */
-        {BGR_BACKGROUND,    COLOR_WINDOW}       // magenta
-    };
-#endif
-
-    int NUM_MAPS = (sizeof(ColorMap)/sizeof(COLORMAP));
-    int n;
-    for ( n = 0; n < NUM_MAPS; n++)
+    for ( int n = 0; n < WXSIZEOF(ColorMap); n++)
     {
         ColorMap[n].to = ::GetSysColor(ColorMap[n].to);
     }
@@ -1094,23 +1070,20 @@ void wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
     {
         hbmOld = (HBITMAP) SelectObject(hdcMem, hBitmap);
 
-        int i, j, k;
-        for ( i = 0; i < width; i++)
+        for ( int i = 0; i < width; i++ )
         {
-            for ( j = 0; j < height; j++)
+            for ( int j = 0; j < height; j++ )
             {
                 COLORREF pixel = ::GetPixel(hdcMem, i, j);
-                /*
-                BYTE red = GetRValue(pixel);
-                BYTE green = GetGValue(pixel);
-                BYTE blue = GetBValue(pixel);
-                */
 
-                for ( k = 0; k < NUM_MAPS; k ++)
+                for ( int k = 0; k < WXSIZEOF(ColorMap); k++ )
                 {
-                    if ( ColorMap[k].from == pixel )
+                    int distance = abs( GetRValue( pixel ) - GetRValue( ColorMap[k].from )) ;
+                    distance = max( distance , abs(GetGValue(pixel ) - GetGValue( ColorMap[k].from ))) ;
+                    distance = max( distance , abs(GetBValue(pixel ) - GetBValue( ColorMap[k].from ))) ;
+                    if ( distance < 0x10 )
                     {
-                        /* COLORREF actualPixel = */ ::SetPixel(hdcMem, i, j, ColorMap[k].to);
+                        ::SetPixel(hdcMem, i, j, ColorMap[k].to);
                         break;
                     }
                 }