fix for red to blue mapping in toolbar buttons

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

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 819e0b01d3e20bebfb8683d233a52a09d1101c70..a8c7b9d0e8c52bc10359233b65e800c15d78633e 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -35,9 +35,7 @@
 
 #include "wx/minifram.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
 
 
 #else
@@ -55,9 +53,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 #endif
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
 
 long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
@@ -181,13 +177,13 @@ wxMiniFrame::~wxMiniFrame(void)
 #define HASCAPTION( hwnd )    (TestWinStyle( hwnd, IBS_VERTCAPTION ) ||\
                                TestWinStyle( hwnd, IBS_HORZCAPTION ))
                                
-#define SETCAPTIONSIZE(h,i)   (UINT)SetProp(h,_T("ibSize"),(HANDLE)i)
-#define GETCAPTIONSIZE(h)     (UINT)GetProp(h,_T("ibSize"))
-#define FREECAPTIONSIZE(h)    RemoveProp(h,_T("ibSize"))
+#define SETCAPTIONSIZE(h,i)   (UINT)SetProp(h,wxT("ibSize"),(HANDLE)i)
+#define GETCAPTIONSIZE(h)     (UINT)GetProp(h,wxT("ibSize"))
+#define FREECAPTIONSIZE(h)    RemoveProp(h,wxT("ibSize"))
 
-#define SETMENUWASUPFLAG(h,i) (UINT)SetProp(h,_T("ibFlag"),(HANDLE)i)
-#define GETMENUWASUPFLAG(h)   (UINT)GetProp(h,_T("ibFlag"))
-#define FREEMENUWASUPFLAG(h)  RemoveProp(h,_T("ibFlag"))
+#define SETMENUWASUPFLAG(h,i) (UINT)SetProp(h,wxT("ibFlag"),(HANDLE)i)
+#define GETMENUWASUPFLAG(h)   (UINT)GetProp(h,wxT("ibFlag"))
+#define FREEMENUWASUPFLAG(h)  RemoveProp(h,wxT("ibFlag"))
 
 /////////////////////////////////////////////////////////////////////
 // Little known fact:
@@ -405,7 +401,7 @@ LRESULT WINAPI ibDefWindowProc( HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lPa
                 {
                     // VZ: I don't know what should be here, but the vars must
                     //     be inited!
-                    wxFAIL_MSG(_T("don't know how to initialize cx, cy"));
+                    wxFAIL_MSG(wxT("don't know how to initialize cx, cy"));
 
                     cx = cy = 0;
                 }
@@ -916,7 +912,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
             {
                 // Can only rotate true type fonts (well, ok, we could
                 // try and use "modern").
-                wxStrcpy( lf.lfFaceName, _T("Arial") ) ;
+                wxStrcpy( lf.lfFaceName, wxT("Arial") ) ;
                 lf.lfPitchAndFamily = FF_SWISS | 0x04;
                 lf.lfEscapement = 900 ;
 
@@ -983,7 +979,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
             SetBkMode( hDC, nBkMode ) ;
             
 #ifdef __WIN16__
-            GlobalFreePtr( (unsigned int) lpsz ) ;
+            GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ;
 #else
             GlobalFreePtr( lpsz ) ;
 #endif