enable wxFontMapper in wxDFB port

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 684e3f117ff8e7c1eb16633cd92adab495359b93..8d5ad8a0c7d5dac72e86129dee9cb1d9a6d4a61b 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -29,6 +29,7 @@
 #include "wx/toolbar.h"
 
 #ifndef WX_PRECOMP
 #include "wx/toolbar.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

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


@@ -49,9 +50,6 @@
 #include "wx/msw/uxtheme.h"
 #endif
 
 #include "wx/msw/uxtheme.h"
 #endif
 

-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-

 // 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
 // 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


@@ -182,7 +180,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxToolBarTool)
 };
 
     DECLARE_NO_COPY_CLASS(wxToolBarTool)
 };
 

-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -237,6 +234,8 @@ bool wxToolBar::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 

+    FixupStyle();
+

     // MSW-specific initialisation
     if ( !MSWCreateToolbar(pos, size) )
         return false;
     // MSW-specific initialisation
     if ( !MSWCreateToolbar(pos, size) )
         return false;


@@ -248,7 +247,7 @@ bool wxToolBar::Create(wxWindow *parent,
 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {
 #if wxUSE_UXTHEME
     if ( style & wxTB_FLAT )
     {

-        LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
+        LRESULT style = GetMSWToolbarStyle();

 
         if ( !(style & TBSTYLE_FLAT) )
             ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
 
         if ( !(style & TBSTYLE_FLAT) )
             ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);


@@ -350,7 +349,7 @@ wxSize wxToolBar::DoGetBestSize() const
         sizeBest.x *= GetToolsCount();
 
         // reverse horz and vertical components if necessary
         sizeBest.x *= GetToolsCount();
 
         // reverse horz and vertical components if necessary

-        if ( HasFlag(wxTB_VERTICAL) )
+        if ( IsVertical() )

         {
             int t = sizeBest.x;
             sizeBest.x = sizeBest.y;
         {
             int t = sizeBest.x;
             sizeBest.x = sizeBest.y;


@@ -405,6 +404,12 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( style & wxTB_VERTICAL )
         msStyle |= CCS_VERT;
 
     if ( style & wxTB_VERTICAL )
         msStyle |= CCS_VERT;
 

+    if( style & wxTB_BOTTOM )
+        msStyle |= CCS_BOTTOM;
+
+    if ( style & wxTB_RIGHT )
+        msStyle |= CCS_RIGHT;
+

     return msStyle;
 }
 
     return msStyle;
 }
 


@@ -541,8 +546,6 @@ bool wxToolBar::Realize()
         // nothing to do
         return true;
 
         // nothing to do
         return true;
 

-    const bool isVertical = HasFlag(wxTB_VERTICAL);
-

 #ifdef wxREMAP_BUTTON_COLOURS
     // don't change the values of these constants, they can be set from the
     // user code via wxSystemOptions
 #ifdef wxREMAP_BUTTON_COLOURS
     // don't change the values of these constants, they can be set from the
     // user code via wxSystemOptions


@@ -781,17 +784,21 @@ bool wxToolBar::Realize()
             }
         }
 
             }
         }
 

-        if ( m_disabledImgList )
+        // disable image lists are only supported in comctl32.dll 4.70+
+        if ( wxApp::GetComCtl32Version() >= 470 )

         {
         {

+            HIMAGELIST hil = m_disabledImgList
+                                ? GetHimagelistOf(m_disabledImgList)
+                                : 0;
+
+            // notice that we set the image list even if don't have one right
+            // now as we could have it before and need to reset it in this case

             HIMAGELIST oldImageList = (HIMAGELIST)
             HIMAGELIST oldImageList = (HIMAGELIST)

-                ::SendMessage(GetHwnd(),
-                              TB_SETDISABLEDIMAGELIST,
-                              0,
-                              (LPARAM)GetHimagelistOf(m_disabledImgList));
+              ::SendMessage(GetHwnd(), TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hil);

 
             // delete previous image list if any
             if ( oldImageList )
 
             // delete previous image list if any
             if ( oldImageList )

-                ::DeleteObject( oldImageList );
+                ::DeleteObject(oldImageList);

         }
     }
 
         }
     }
 


@@ -819,7 +826,7 @@ bool wxToolBar::Realize()
 
         // don't add separators to the vertical toolbar with old comctl32.dll
         // versions as they didn't handle this properly
 
         // don't add separators to the vertical toolbar with old comctl32.dll
         // versions as they didn't handle this properly

-        if ( isVertical && tool->IsSeparator() &&
+        if ( IsVertical() && tool->IsSeparator() &&

                 wxApp::GetComCtl32Version() <= 472 )
         {
             continue;
                 wxApp::GetComCtl32Version() <= 472 )
         {
             continue;


@@ -943,7 +950,7 @@ bool wxToolBar::Realize()
         // get the items size for all items but for the horizontal ones we
         // don't need to deal with the non controls
         bool isControl = tool->IsControl();
         // get the items size for all items but for the horizontal ones we
         // don't need to deal with the non controls
         bool isControl = tool->IsControl();

-        if ( !isControl && !isVertical )
+        if ( !isControl && !IsVertical() )

             continue;
 
         // note that we use TB_GETITEMRECT and not TB_GETRECT because the
             continue;
 
         // note that we use TB_GETITEMRECT and not TB_GETRECT because the


@@ -1034,7 +1041,7 @@ bool wxToolBar::Realize()
         }
 
         int top;
         }
 
         int top;

-        if ( isVertical )
+        if ( IsVertical() )

         {
             left = 0;
             top = y;
         {
             left = 0;
             top = y;


@@ -1056,7 +1063,7 @@ bool wxToolBar::Realize()
     // separators which we added just for aligning the controls
     m_nButtons = index;
 
     // separators which we added just for aligning the controls
     m_nButtons = index;
 

-    if ( !isVertical )
+    if ( !IsVertical() )

     {
         if ( m_maxRows == 0 )
             // if not set yet, only one row
     {
         if ( m_maxRows == 0 )
             // if not set yet, only one row


@@ -1064,9 +1071,9 @@ bool wxToolBar::Realize()
     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {
     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {

-        if ( m_maxRows == 0 )
-            // if not set yet, have one column
-            SetRows(m_nButtons);
+        // if not set yet, have one column
+        m_maxRows = 1;
+        SetRows(m_nButtons);        

     }
 
     InvalidateBestSize();
     }
 
     InvalidateBestSize();


@@ -1273,6 +1280,12 @@ void wxToolBar::UpdateSize()
 // toolbar styles
 // ---------------------------------------------------------------------------
 
 // toolbar styles
 // ---------------------------------------------------------------------------
 

+// get the TBSTYLE of the given toolbar window
+long wxToolBar::GetMSWToolbarStyle() const
+{
+    return ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
+}
+

 void wxToolBar::SetWindowStyleFlag(long style)
 {
     // the style bits whose changes force us to recreate the toolbar
 void wxToolBar::SetWindowStyleFlag(long style)
 {
     // the style bits whose changes force us to recreate the toolbar


@@ -1372,7 +1385,29 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
     RECT rect = wxGetClientRect(GetHwnd());
     HDC hdc = GetHdcOf((*event.GetDC()));
 
     RECT rect = wxGetClientRect(GetHwnd());
     HDC hdc = GetHdcOf((*event.GetDC()));
 

-    if ( UseBgCol() )
+#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 ( !UseBgCol() && !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
+
+    if ( UseBgCol() || (GetMSWToolbarStyle() & TBSTYLE_TRANSPARENT) )

     {
         // do draw our background
         //
     {
         // do draw our background
         //


@@ -1386,39 +1421,8 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
     }
     else // we have no non default background colour
     {
     }
     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
-
-        // if we are transparent then paint our background ourselves
-        LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
-        if ( style & TBSTYLE_TRANSPARENT )
-        {
-            ::FillRect(hdc, &rect, ::GetSysColorBrush(COLOR_BTNFACE));
-        }
-        else
-        {
-            // let the system do it for us
-            event.Skip();
-        }
+        // let the system do it for us
+        event.Skip();

     }
 }
 
     }
 }
 


@@ -1431,7 +1435,7 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
     {
         int w, h;
 
     {
         int w, h;
 

-        if ( GetWindowStyle() & wxTB_VERTICAL )
+        if ( IsVertical() )

         {
             w = r.right - r.left;
             if ( m_maxRows )
         {
             w = r.right - r.left;
             if ( m_maxRows )