#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"
#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)
#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:
{
// 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;
}
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 ;
{
// 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 ;
SetBkMode( hDC, nBkMode ) ;
#ifdef __WIN16__
- GlobalFreePtr( (unsigned int) lpsz ) ;
+ GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ;
#else
GlobalFreePtr( lpsz ) ;
#endif
} // DrawArrow()
#endif // wxUSE_ITSY_BITSY
+
+#endif // __WIN32__