A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,

especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:39:11 +00:00
parent 5f8e1c164d
commit 837e57436a
67 changed files with 778 additions and 763 deletions

View File

@@ -166,13 +166,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,_T("ibSize"),(HANDLE)i)
#define GETCAPTIONSIZE(h) (UINT)GetProp(h,_T("ibSize"))
#define FREECAPTIONSIZE(h) RemoveProp(h,_T("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,_T("ibFlag"),(HANDLE)i)
#define GETMENUWASUPFLAG(h) (UINT)GetProp(h,_T("ibFlag"))
#define FREEMENUWASUPFLAG(h) RemoveProp(h,_T("ibFlag"))
/////////////////////////////////////////////////////////////////////
// Little known fact:
@@ -390,7 +390,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(_T("don't know how to initialize cx, cy"));
cx = cy = 0;
}
@@ -870,14 +870,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 ;
@@ -901,7 +901,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, _T("Arial") ) ;
lf.lfPitchAndFamily = FF_SWISS | 0x04;
lf.lfEscapement = 900 ;