New configure

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

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index ca7b86bea6338e780c527666198a3402399046ab..346e95d9b9ac73296415683edc856016740cc2be 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -45,7 +45,7 @@ long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
       (GetWindowStyleFlag() & wxTINY_CAPTION_VERT))
     return ::ibDefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
   else if ( m_oldWndProc )
       (GetWindowStyleFlag() & wxTINY_CAPTION_VERT))
     return ::ibDefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
   else if ( m_oldWndProc )

-       return ::CallWindowProc(CASTWNDPROC (FARPROC) m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+       return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);

   else
        return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
 }
   else
        return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
 }


@@ -841,13 +841,13 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
     DRAWFASTRECT( hDC, &rc ) ;
 
     hbrCaption = CreateSolidBrush( rgbCaptionBG ) ;
     DRAWFASTRECT( hDC, &rc ) ;
 
     hbrCaption = CreateSolidBrush( rgbCaptionBG ) ;

-    hbrCaption = SelectObject( hDC, hbrCaption ) ;
-    SelectObject( hDC, GetStockObject( NULL_PEN ) ) ;
+    hbrCaption = (HBRUSH) SelectObject( hDC, hbrCaption ) ;
+    SelectObject( hDC, (HPEN) GetStockObject( NULL_PEN ) ) ;

     if (fVert)
         Rectangle( hDC, rcCap.left, rcCap.top, rcCap.right, rcCap.bottom + 1 ) ;
     else
         Rectangle( hDC, rcCap.left, rcCap.top, rcCap.right+1, rcCap.bottom ) ;
     if (fVert)
         Rectangle( hDC, rcCap.left, rcCap.top, rcCap.right, rcCap.bottom + 1 ) ;
     else
         Rectangle( hDC, rcCap.left, rcCap.top, rcCap.right+1, rcCap.bottom ) ;

-    hbrCaption = SelectObject( hDC, hbrCaption ) ;
+    hbrCaption = (HBRUSH) SelectObject( hDC, hbrCaption ) ;

     DeleteObject( hbrCaption ) ;
 
     
     DeleteObject( hbrCaption ) ;
 
     


@@ -901,7 +901,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
                 lf.lfOrientation = 900 ;
                 
                 hFont = CreateFontIndirect( &lf ) ;
                 lf.lfOrientation = 900 ;
                 
                 hFont = CreateFontIndirect( &lf ) ;

-                hFont = SelectObject( hDC, hFont ) ;
+                hFont = (HFONT) SelectObject( hDC, hFont ) ;

                 
                 GetTextExtentPoint( hDC, lpsz, ui, &Size ) ;
                 cx = rcCap.bottom - ((rcCap.bottom - rcCap.top - Size.cx) / 2) ;
                 
                 GetTextExtentPoint( hDC, lpsz, ui, &Size ) ;
                 cx = rcCap.bottom - ((rcCap.bottom - rcCap.top - Size.cx) / 2) ;


@@ -920,7 +920,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
                                lpsz, ui, NULL ) ;
                 }
                 
                                lpsz, ui, NULL ) ;
                 }
                 

-                hFont = SelectObject( hDC, hFont ) ;
+                hFont = (HFONT) SelectObject( hDC, hFont ) ;

                 DeleteObject( hFont ) ;
             }
             else
                 DeleteObject( hFont ) ;
             }
             else


@@ -931,7 +931,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
                 lf.lfPitchAndFamily = FF_SWISS ;
                 
                 hFont = CreateFontIndirect( &lf ) ;
                 lf.lfPitchAndFamily = FF_SWISS ;
                 
                 hFont = CreateFontIndirect( &lf ) ;

-                hFont = SelectObject( hDC, hFont ) ;
+                hFont = (HFONT) SelectObject( hDC, hFont ) ;

                 
                 GetTextExtentPoint( hDC, lpsz, ui, &Size ) ;
                 cx = rcCap.left + ((rcCap.right - rcCap.left - Size.cx) / 2) ;
                 
                 GetTextExtentPoint( hDC, lpsz, ui, &Size ) ;
                 cx = rcCap.left + ((rcCap.right - rcCap.left - Size.cx) / 2) ;


@@ -945,7 +945,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
                             ETO_CLIPPED, &rcCap,
                             lpsz, ui, NULL ) ;
                 
                             ETO_CLIPPED, &rcCap,
                             lpsz, ui, NULL ) ;
                 

-                hFont = SelectObject( hDC, hFont ) ;
+                hFont = (HFONT) SelectObject( hDC, hFont ) ;

                 DeleteObject( hFont ) ;
             }
 
                 DeleteObject( hFont ) ;
             }