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

OS/2 updates for statusbar processing and easier VA debugging

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-10-24 21:48:58 +00:00
parent 28be2e8a17
commit 7e99520bd3
21 changed files with 621 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/os2/settings.cpp
View File

@@ -44,7 +44,6 @@ wxColour wxSystemSettings::GetSystemColour(
,GetGValue(vRef)
,GetBValue(vRef)
);
return vCol;
break;
case wxSYS_COLOUR_WINDOWFRAME:
@@ -56,7 +55,6 @@ wxColour wxSystemSettings::GetSystemColour(
,GetGValue(vRef)
,GetBValue(vRef)
);
return vCol;
break;
case wxSYS_COLOUR_MENUTEXT:
@@ -79,7 +77,6 @@ wxColour wxSystemSettings::GetSystemColour(
,GetGValue(vRef)
,GetBValue(vRef)
);
return vCol;
break;
case wxSYS_COLOUR_BTNSHADOW:
@@ -91,7 +88,6 @@ wxColour wxSystemSettings::GetSystemColour(
,GetGValue(vRef)
,GetBValue(vRef)
);
return vCol;
break;
case wxSYS_COLOUR_BTNHIGHLIGHT:
@@ -103,7 +99,6 @@ wxColour wxSystemSettings::GetSystemColour(
,GetGValue(vRef)
,GetBValue(vRef)
);
return vCol;
break;
//
@@ -118,7 +113,7 @@ wxColour wxSystemSettings::GetSystemColour(
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
return(*wxBLACK);
vCol = (*wxBLACK);
break;
//
@@ -128,7 +123,7 @@ wxColour wxSystemSettings::GetSystemColour(
case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_HIGHLIGHT:
return(*wxBLUE);
vCol = (*wxBLUE);
break;
case wxSYS_COLOUR_SCROLLBAR:
@@ -142,7 +137,7 @@ wxColour wxSystemSettings::GetSystemColour(
case wxSYS_COLOUR_3DDKSHADOW:
case wxSYS_COLOUR_3DLIGHT:
case wxSYS_COLOUR_INFOBK:
return(*wxLIGHT_GREY);
vCol = (*wxLIGHT_GREY);
break;
default:
@@ -154,7 +149,6 @@ wxColour wxSystemSettings::GetSystemColour(
,GetGValue(vRef)
,GetBValue(vRef)
);
return vCol;
break;
}
return(vCol);
@@ -187,8 +181,10 @@ wxFont wxSystemSettings::GetSystemFont(int index)
break;
}
}
if(wxSWISS_FONT)
return *wxSWISS_FONT;
return *wxSWISS_FONT;
return wxNullFont;
}
// Get a system metric, e.g. scrollbar size