X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fd5cb0124e62ab1fc41f93382a205d95b00e75..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/msw/minifram.cpp diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp index e40b0532f8..57464f4e18 100644 --- a/src/msw/minifram.cpp +++ b/src/msw/minifram.cpp @@ -30,6 +30,19 @@ #include "wx/utils.h" #endif + +#ifdef __WIN32__ + +#include "wx/minifram.h" + +#if !USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) +#endif + + +#else + + #if wxUSE_ITSY_BITSY #include "wx/minifram.h" @@ -168,13 +181,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: @@ -392,7 +405,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; } @@ -903,7 +916,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 ; @@ -970,7 +983,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 @@ -1610,3 +1623,5 @@ void PASCAL DrawArrow( HDC hdc, LPRECT lprc, UINT uiStyle ) } // DrawArrow() #endif // wxUSE_ITSY_BITSY + +#endif // __WIN32__