AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-08-17 03:02:15 +00:00
parent 3ecd9f92e4
commit 406d283a64
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/filefn.cpp
View File

@ -1391,7 +1391,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
#ifdef HAVE_WGETCWD
#if wxUSE_UNICODE_MSLU
if ( wxGetOsVersion() != wxWIN95 )
if ( wxGetOsVersion() != wxOS_WINDOWS_9X )
#else
char *cbuf = NULL; // never really used because needsANSI will always be false
#endif

4
src/common/strconv.cpp
View File

@ -2229,11 +2229,11 @@ private:
int verMaj, verMin;
switch ( wxGetOsVersion(&verMaj, &verMin) )
{
case wxWIN95:
case wxOS_WINDOWS_9X:
s_isWin98Or2k = verMaj >= 4 && verMin >= 10;
break;
case wxWINDOWS_NT:
case wxOS_WINDOWS_NT:
s_isWin98Or2k = verMaj >= 5;
break;

2
src/generic/combog.cpp
View File

@ -288,7 +288,7 @@ void wxGenericComboControl::OnMouseEvent( wxMouseEvent& event )
if ( PreprocessMouseEvent(event,handlerFlags) )
return;
const bool ctrlIsButton = wxPlatformIs(wxMSW);
const bool ctrlIsButton = wxPlatformIs(wxOS_WINDOWS);
if ( ctrlIsButton &&
(m_windowStyle & (wxCC_SPECIAL_DCLICK|wxCB_READONLY)) == wxCB_READONLY )

4
src/msw/dc.cpp
View File

@ -1807,8 +1807,8 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
{
// Win9x and WinNT+ have different limits
int version = wxGetOsVersion();
maxLenText = version == wxWINDOWS_NT ? 65535 : 8192;
maxWidth = version == wxWINDOWS_NT ? INT_MAX : 32767;
maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192;
maxWidth = version == wxOS_WINDOWS_NT ? INT_MAX : 32767;
}
widths.Empty();

2
src/msw/font.cpp
View File

@ -638,7 +638,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
// is returned as default GUI font for compatibility
int verMaj;
ff_family = FF_SWISS;
if(wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
facename.Add(_T("MS Shell Dlg 2"));
else
facename.Add(_T("MS Shell Dlg"));

2
src/msw/main.cpp
View File

@ -247,7 +247,7 @@ static bool wxIsUnicodeAvailable()
{
static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
if ( wxGetOsVersion() != wxWINDOWS_NT )
if ( wxGetOsVersion() != wxOS_WINDOWS_NT )
{
// we need to be built with MSLU support
#if !wxUSE_UNICODE_MSLU

2
src/msw/mslu.cpp
View File

@ -30,7 +30,7 @@
bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
{
#if wxUSE_UNICODE_MSLU
return (wxGetOsVersion() == wxWIN95);
return (wxGetOsVersion() == wxOS_WINDOWS_9X);
#else
return false;
#endif

6
src/msw/pen.cpp
View File

@ -123,7 +123,7 @@ bool wxPen::RealizeResource()
// Join style, Cap style, Pen Stippling
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
// Only NT can display dashed or dotted lines with width > 1
if ( os != wxWINDOWS_NT &&
if ( os != wxOS_WINDOWS_NT &&
(M_PENDATA->m_style == wxDOT ||
M_PENDATA->m_style == wxLONG_DASH ||
M_PENDATA->m_style == wxSHORT_DASH ||
@ -226,7 +226,7 @@ bool wxPen::RealizeResource()
}
// Win32s doesn't have ExtCreatePen function...
if (os==wxWINDOWS_NT || os==wxWIN95)
if (os == wxOS_WINDOWS_NT || os == wxOS_WINDOWS_9X)
{
M_PENDATA->m_hPen =
(WXHPEN) ExtCreatePen( ms_style,
@ -389,7 +389,7 @@ int wx2msPenStyle(int wx_style)
return PS_NULL;
case wxUSER_DASH:
// if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
// if (wxGetOsVersion()==wxOS_WINDOWS_NT || wxGetOsVersion()==wxOS_WINDOWS_9X)
return PS_USERSTYLE;
}
#else

6
src/msw/settings.cpp
View File

@ -228,7 +228,7 @@ wxFont wxCreateFontFromStockObject(int index)
// We want Windows 2000 or later to have new fonts even MS Shell Dlg
// is returned as default GUI font for compatibility
int verMaj;
if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
#endif
// Under MicroWindows we pass the HFONT as well
@ -449,12 +449,12 @@ extern wxFont wxGetCCDefaultFont()
int verMaj, verMin;
switch ( wxGetOsVersion(&verMaj, &verMin) )
{
case wxWIN95:
case wxOS_WINDOWS_9X:
// 4.10 is Win98
useIconFont = verMaj == 4 && verMin >= 10;
break;
case wxWINDOWS_NT:
case wxOS_WINDOWS_NT:
// 5.0 is Win2k
useIconFont = verMaj >= 5;
break;

2
src/msw/toplevel.cpp
View File

@ -1086,7 +1086,7 @@ bool wxTopLevelWindowMSW::CanSetTransparent()
if (os_type == -1)
os_type = ::wxGetOsVersion(&ver_major);
return (os_type == wxWINDOWS_NT && ver_major >= 5);
return (os_type == wxOS_WINDOWS_NT && ver_major >= 5);
}
// ----------------------------------------------------------------------------

6
src/msw/utils.cpp
View File

@ -951,7 +951,7 @@ bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags))
#elif defined(__WIN32__)
bool bOK = true;
if ( wxGetOsVersion(NULL, NULL) == wxWINDOWS_NT ) // if is NT or 2K
if ( wxGetOsVersion(NULL, NULL) == wxOS_WINDOWS_NT ) // if is NT or 2K
{
// Get a token for this process.
HANDLE hToken;
@ -1221,7 +1221,7 @@ wxWinVersion wxGetWinVersion()
verMin;
switch ( wxGetOsVersion(&verMaj, &verMin) )
{
case wxWIN95:
case wxOS_WINDOWS_9X:
if ( verMaj == 4 )
{
switch ( verMin )
@ -1238,7 +1238,7 @@ wxWinVersion wxGetWinVersion()
}
break;
case wxWINDOWS_NT:
case wxOS_WINDOWS_NT:
switch ( verMaj )
{
case 3:

2
src/msw/window.cpp
View File

@ -829,7 +829,7 @@ void wxWindowMSW::MSWUpdateUIState(int action, int state)
if ( s_needToUpdate == -1 )
{
int verMaj, verMin;
s_needToUpdate = wxGetOsVersion(&verMaj, &verMin) == wxWINDOWS_NT &&
s_needToUpdate = wxGetOsVersion(&verMaj, &verMin) == wxOS_WINDOWS_NT &&
verMaj >= 5;
}