git-svn-id: svn://10.65.10.50/branches/R_10_00@23061 c028cbd2-c16b-5b4b-a496-9718f37d4682

This commit is contained in:
guy 2015-03-31 06:21:35 +00:00
parent 8b5760a3c6
commit b3f5edc274

View File

@ -151,14 +151,7 @@ void xvt_app_create(int WXUNUSED(argc), char** WXUNUSED(argv), unsigned long WXU
} }
else else
{ {
#ifdef __WXMSW__
style |= wxMAXIMIZE; style |= wxMAXIMIZE;
#else
style &= ~wxMAXIMIZE;
const wxRect rect = wxGetClientDisplayRect();
pos = rect.GetPosition();
size = rect.GetSize();
#endif
} }
if (_startup_style & WSF_NO_TASKBAR) if (_startup_style & WSF_NO_TASKBAR)
@ -458,7 +451,6 @@ BOOLEAN xvt_dongle_sl_write_block(unsigned short reg, unsigned short size, const
// Font cache // Font cache
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
//WX_DECLARE_HASH_MAP(wxString, wxFont*, wxStringHash, wxStringEqual, wxFontHashMap);
WX_DECLARE_STRING_HASH_MAP(wxFont*, wxFontHashMap); WX_DECLARE_STRING_HASH_MAP(wxFont*, wxFontHashMap);
class TFontCache class TFontCache