X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/msw/minifram.cpp?ds=sidebyside diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp index 8192f20092..a8c7b9d0e8 100644 --- a/src/msw/minifram.cpp +++ b/src/msw/minifram.cpp @@ -20,6 +20,9 @@ #pragma hdrstop #endif +#include "wx/window.h" +#include "wx/msw/private.h" + #ifndef WX_PRECOMP #include "wx/setup.h" #include "wx/event.h" @@ -27,18 +30,30 @@ #include "wx/utils.h" #endif + +#ifdef __WIN32__ + +#include "wx/minifram.h" + +IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) + + +#else + + #if wxUSE_ITSY_BITSY #include "wx/minifram.h" -#include "wx/msw/private.h" +#ifndef __TWIN32__ #ifdef __GNUWIN32__ +#ifndef wxUSE_NORLANDER_HEADERS #include "wx/msw/gnuwin32/extra.h" #endif +#endif +#endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { @@ -84,12 +99,12 @@ wxMiniFrame::~wxMiniFrame(void) // ////////////////////////////////////////////////////////////////////////// -#include -#include +#include "wx/window.h" +#include "wx/msw/private.h" #include -#if !defined( __WATCOMC__ ) && !defined( __MWERKS__ ) +#if !defined( __WATCOMC__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) #include #endif @@ -162,13 +177,13 @@ wxMiniFrame::~wxMiniFrame(void) #define HASCAPTION( hwnd ) (TestWinStyle( hwnd, IBS_VERTCAPTION ) ||\ TestWinStyle( hwnd, IBS_HORZCAPTION )) -#define SETCAPTIONSIZE(h,i) (UINT)SetProp(h,"ibSize",(HANDLE)i) -#define GETCAPTIONSIZE(h) (UINT)GetProp(h,"ibSize") -#define FREECAPTIONSIZE(h) RemoveProp(h,"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,"ibFlag",(HANDLE)i) -#define GETMENUWASUPFLAG(h) (UINT)GetProp(h,"ibFlag") -#define FREEMENUWASUPFLAG(h) RemoveProp(h,"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: @@ -386,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("don't know how to initialize cx, cy"); + wxFAIL_MSG(wxT("don't know how to initialize cx, cy")); cx = cy = 0; } @@ -866,14 +881,14 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc, if (fWin31) { HFONT hFont ; - LPSTR lpsz ; + LPTSTR lpsz ; LOGFONT lf ; TEXTMETRIC tm ; int cx ; int cy ; SIZE Size ; - lpsz = (char*)GlobalAllocPtr( GHND, ui + 2 ); + lpsz = (wxChar*)GlobalAllocPtr( GHND, (ui + 2) * sizeof(wxChar) ); if (lpsz) { UINT nBkMode ; @@ -897,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"). - strcpy( lf.lfFaceName, "Arial" ) ; + wxStrcpy( lf.lfFaceName, wxT("Arial") ) ; lf.lfPitchAndFamily = FF_SWISS | 0x04; lf.lfEscapement = 900 ; @@ -963,7 +978,11 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc, rgbText = SetTextColor( hDC, rgbText ) ; SetBkMode( hDC, nBkMode ) ; +#ifdef __WIN16__ + GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ; +#else GlobalFreePtr( lpsz ) ; +#endif } } @@ -1600,3 +1619,5 @@ void PASCAL DrawArrow( HDC hdc, LPRECT lprc, UINT uiStyle ) } // DrawArrow() #endif // wxUSE_ITSY_BITSY + +#endif // __WIN32__