WinCE fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-22 14:07:32 +00:00
parent 86d2c8099a
commit f8c10795d5
3 changed files with 6 additions and 2 deletions

View File

@@ -635,7 +635,10 @@ bool wxLaunchDefaultBrowser(const wxString& url)
sei.hIcon = NULL; sei.hIcon = NULL;
sei.hInstApp = NULL; sei.hInstApp = NULL;
sei.hkeyClass = NULL; sei.hkeyClass = NULL;
// Not in WinCE
#if 0
sei.hMonitor = NULL; sei.hMonitor = NULL;
#endif
sei.hProcess = NULL; sei.hProcess = NULL;
sei.hwnd = NULL; sei.hwnd = NULL;
sei.lpClass = NULL; sei.lpClass = NULL;

View File

@@ -457,7 +457,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
// to it without breaking backwards compatibility // to it without breaking backwards compatibility
// classic Win32 version -- this can be useful when we move this into // classic Win32 version -- this can be useful when we move this into
#if 0 #ifdef __WXWINCE__
UINT state = DFCS_BUTTONCHECK; UINT state = DFCS_BUTTONCHECK;
if ( !IsEnabled() ) if ( !IsEnabled() )
state |= DFCS_INACTIVE; state |= DFCS_INACTIVE;

View File

@@ -225,12 +225,13 @@ wxFont wxCreateFontFromStockObject(int index)
{ {
wxNativeFontInfo info; wxNativeFontInfo info;
info.lf = lf; info.lf = lf;
#ifndef __WXWINCE__
// We want Windows 2000 or later to have new fonts even MS Shell Dlg // We want Windows 2000 or later to have new fonts even MS Shell Dlg
// is returned as default GUI font for compatibility // is returned as default GUI font for compatibility
int verMaj; int verMaj;
if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5) if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2")); wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
#endif
// Under MicroWindows we pass the HFONT as well // Under MicroWindows we pass the HFONT as well
// because it's hard to convert HFONT -> LOGFONT -> HFONT // because it's hard to convert HFONT -> LOGFONT -> HFONT
// It's OK to delete stock objects, the delete will be ignored. // It's OK to delete stock objects, the delete will be ignored.