many fixes to wxTextCrtl, wxTreeCrtl, wxListBox,

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

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index 86b2d33e9ffd4794da84638c3c391b277fde43f1..697df07d120aa6eb88eb2de55cfcd3d66f8edbea 100644 (file)
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -68,9 +68,9 @@ wxToolBarMSW::wxToolBarMSW(void)
   m_defaultHeight = DEFAULTBITMAPY;
 }
 
   m_defaultHeight = DEFAULTBITMAPY;
 }
 

-bool wxToolBarMSW::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const int orientation,
-            const int RowsOrColumns, const wxString& name)
+bool wxToolBarMSW::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+            long style, int orientation,
+            int RowsOrColumns, const wxString& name)

 {
        if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
                return FALSE;
 {
        if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
                return FALSE;


@@ -292,7 +292,7 @@ void wxToolBarMSW::OnMouseEvent(wxMouseEvent& event)
 // This function enables/disables a toolbar tool and redraws it.
 // If that would not be done, the enabling/disabling wouldn't be
 // visible on the screen.
 // This function enables/disables a toolbar tool and redraws it.
 // If that would not be done, the enabling/disabling wouldn't be
 // visible on the screen.

-void wxToolBarMSW::EnableTool(const int toolIndex, const bool enable)
+void wxToolBarMSW::EnableTool(int toolIndex, bool enable)

 {
   wxNode *node = m_tools.Find((long)toolIndex);
   if (node)
 {
   wxNode *node = m_tools.Find((long)toolIndex);
   if (node)


@@ -329,8 +329,8 @@ void wxToolBarMSW::DrawTool(wxDC& dc, wxMemoryDC& , wxToolBarTool *tool)
 // If pushedBitmap is NULL, a reversed version of bitmap is
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.
 // If pushedBitmap is NULL, a reversed version of bitmap is
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.

-wxToolBarTool *wxToolBarMSW::AddTool(const int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
-             const bool toggle, const long xPos, const long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+wxToolBarTool *wxToolBarMSW::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
+             bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)

 {
   // Using bitmap2 can cause problems (don't know why!)
 
 {
   // Using bitmap2 can cause problems (don't know why!)
 


@@ -439,7 +439,7 @@ void wxToolBarMSW::CreateMask(WXHDC hdc, int xoffset, int yoffset, int dx, int d
     // krj - create a new bitmap and copy the image from hdc.
     //HBITMAP bitmapOld = SelectObject(hdcGlyphs, hBitmap);
     HBITMAP hBitmap = CreateCompatibleBitmap((HDC) hdc, dx, dy);
     // krj - create a new bitmap and copy the image from hdc.
     //HBITMAP bitmapOld = SelectObject(hdcGlyphs, hBitmap);
     HBITMAP hBitmap = CreateCompatibleBitmap((HDC) hdc, dx, dy);

-    HBITMAP bitmapOld = SelectObject(hdcGlyphs, hBitmap);
+    HBITMAP bitmapOld = (HBITMAP) SelectObject(hdcGlyphs, hBitmap);

     BitBlt(hdcGlyphs, 0,0, dx, dy, (HDC) hdc, 0, 0, SRCCOPY);
 
     // initalize whole area with 1's
     BitBlt(hdcGlyphs, 0,0, dx, dy, (HDC) hdc, 0, 0, SRCCOPY);
 
     // initalize whole area with 1's


@@ -528,11 +528,11 @@ void wxToolBarMSW::DrawButton(WXHDC hdc, int x, int y, int dx, int dy, wxToolBar
 #if !defined(__WIN32__) && !defined(__WIN386__)
     HBITMAP bitmapOld;
     if (tool->m_bitmap2.Ok())
 #if !defined(__WIN32__) && !defined(__WIN386__)
     HBITMAP bitmapOld;
     if (tool->m_bitmap2.Ok())

-      bitmapOld = SelectObject(hdcGlyphs, (HBITMAP) tool->m_bitmap2.GetHBITMAP());
+      bitmapOld = (HBITMAP) SelectObject(hdcGlyphs, (HBITMAP) tool->m_bitmap2.GetHBITMAP());

     else
     else

-      bitmapOld = SelectObject(hdcGlyphs, (HBITMAP) tool->m_bitmap1.GetHBITMAP());
+      bitmapOld = (HBITMAP) SelectObject(hdcGlyphs, (HBITMAP) tool->m_bitmap1.GetHBITMAP());

 #else
 #else

-    HBITMAP bitmapOld = SelectObject(hdcGlyphs, (HBITMAP) tool->m_bitmap1.GetHBITMAP());
+    HBITMAP bitmapOld = (HBITMAP) SelectObject(hdcGlyphs, (HBITMAP) tool->m_bitmap1.GetHBITMAP());

 #endif    
 
     // calculate offset of face from (x,y).  y is always from the top,
 #endif    
 
     // calculate offset of face from (x,y).  y is always from the top,


@@ -564,7 +564,7 @@ void wxToolBarMSW::DrawButton(WXHDC hdc, int x, int y, int dx, int dy, wxToolBar
        if (!(state & wxTBSTATE_INDETERMINATE)) {
            hbr = CreateSolidBrush(m_rgbHilight);
            if (hbr) {
        if (!(state & wxTBSTATE_INDETERMINATE)) {
            hbr = CreateSolidBrush(m_rgbHilight);
            if (hbr) {

-               hbrOld = SelectObject((HDC) hdc, hbr);
+               hbrOld = (HBRUSH) SelectObject((HDC) hdc, hbr);

                if (hbrOld) {
                    // draw hilight color where we have 0's in the mask
                     BitBlt((HDC) hdc, x + 1, y + 1, dxFace, dyFace, (HDC) m_hdcMono, 0, 0, 0x00B8074A);
                if (hbrOld) {
                    // draw hilight color where we have 0's in the mask
                     BitBlt((HDC) hdc, x + 1, y + 1, dxFace, dyFace, (HDC) m_hdcMono, 0, 0, 0x00B8074A);


@@ -577,7 +577,7 @@ void wxToolBarMSW::DrawButton(WXHDC hdc, int x, int y, int dx, int dy, wxToolBar
        // gray out glyph
        hbr = CreateSolidBrush(m_rgbShadow);
        if (hbr) {
        // gray out glyph
        hbr = CreateSolidBrush(m_rgbShadow);
        if (hbr) {

-           hbrOld = SelectObject((HDC) hdc, hbr);
+           hbrOld = (HBRUSH) SelectObject((HDC) hdc, hbr);

            if (hbrOld) {
                // draw the shadow color where we have 0's in the mask
                 BitBlt((HDC) hdc, x, y, dxFace, dyFace, (HDC) m_hdcMono, 0, 0, 0x00B8074A);
            if (hbrOld) {
                // draw the shadow color where we have 0's in the mask
                 BitBlt((HDC) hdc, x, y, dxFace, dyFace, (HDC) m_hdcMono, 0, 0, 0x00B8074A);


@@ -593,7 +593,7 @@ void wxToolBarMSW::DrawButton(WXHDC hdc, int x, int y, int dx, int dy, wxToolBar
 
     if (state & (wxTBSTATE_CHECKED | wxTBSTATE_INDETERMINATE)) {
 
 
     if (state & (wxTBSTATE_CHECKED | wxTBSTATE_INDETERMINATE)) {
 

-        hbrOld = SelectObject((HDC) hdc, (HBRUSH) m_hbrDither);
+        hbrOld = (HBRUSH) SelectObject((HDC) hdc, (HBRUSH) m_hbrDither);

        if (hbrOld) {
 
            if (!bMaskCreated)
        if (hbrOld) {
 
            if (!bMaskCreated)


@@ -817,7 +817,7 @@ WXHBITMAP wxToolBarMSW::CreateMappedBitmap(WXHINSTANCE WXUNUSED(hInstance), void
 //    hbm = CreateDiscardableBitmap(hdc, i, hgt);
     hbm = CreateCompatibleBitmap(hdc, i, hgt);
     if (hbm) {
 //    hbm = CreateDiscardableBitmap(hdc, i, hgt);
     hbm = CreateCompatibleBitmap(hdc, i, hgt);
     if (hbm) {

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

 
         // set the main image
         StretchDIBits(hdcMem, 0, 0, wid, hgt, 0, 0, wid, hgt, lpBits,
 
         // set the main image
         StretchDIBits(hdcMem, 0, 0, wid, hgt, 0, 0, wid, hgt, lpBits,