Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove Win32S-specific code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-08-17 18:48:03 +00:00
parent 2fd85ab3e8
commit 286b8de534
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/gdiimage.cpp
View File

@@ -572,7 +572,7 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON)); wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
#ifndef __WXWINCE__ #ifndef __WXWINCE__
if ( hicon && wxGetOsVersion() != wxWIN32S ) if (hicon)
{ {
ICONINFO info; ICONINFO info;
if ( !::GetIconInfo(hicon, &info) ) if ( !::GetIconInfo(hicon, &info) )

30
src/msw/pen.cpp
View File

@@ -225,25 +225,14 @@ bool wxPen::RealizeResource()
real_dash = (wxMSWDash*)NULL; real_dash = (wxMSWDash*)NULL;
} }
// Win32s doesn't have ExtCreatePen function... M_PENDATA->m_hPen =
if (os == wxOS_WINDOWS_NT || os == wxOS_WINDOWS_9X) (WXHPEN) ExtCreatePen( ms_style,
{ M_PENDATA->m_width,
M_PENDATA->m_hPen = &logb,
(WXHPEN) ExtCreatePen( ms_style, M_PENDATA->m_style == wxUSER_DASH
M_PENDATA->m_width, ? M_PENDATA->m_nbDash
&logb, : 0,
M_PENDATA->m_style == wxUSER_DASH (LPDWORD)real_dash );
? M_PENDATA->m_nbDash
: 0,
(LPDWORD)real_dash );
}
else
{
M_PENDATA->m_hPen =
(WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
M_PENDATA->m_width,
ms_colour );
}
delete [] real_dash; delete [] real_dash;
} }
@@ -389,8 +378,7 @@ int wx2msPenStyle(int wx_style)
return PS_NULL; return PS_NULL;
case wxUSER_DASH: case wxUSER_DASH:
// if (wxGetOsVersion()==wxOS_WINDOWS_NT || wxGetOsVersion()==wxOS_WINDOWS_9X) return PS_USERSTYLE;
return PS_USERSTYLE;
} }
#else #else
wxUnusedVar(wx_style); wxUnusedVar(wx_style);