Cosmetic fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -156,10 +156,7 @@ bool wxComboBox::Create(
|
|||||||
//
|
//
|
||||||
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
|
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
|
||||||
|
|
||||||
SetFont(*wxSMALL_FONT);
|
for (int i = 0; i < n; i++)
|
||||||
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < n; i++)
|
|
||||||
{
|
{
|
||||||
Append(asChoices[i]);
|
Append(asChoices[i]);
|
||||||
}
|
}
|
||||||
|
@@ -1268,7 +1268,7 @@ void wxDC::DoDrawIcon(
|
|||||||
//
|
//
|
||||||
// Need to copy back into a bitmap. ::WinDrawPointer uses device coords
|
// Need to copy back into a bitmap. ::WinDrawPointer uses device coords
|
||||||
// and I don't feel like figuring those out for scrollable windows so
|
// and I don't feel like figuring those out for scrollable windows so
|
||||||
// just convert to a bitmap then let the DoDrawBitmap routing display it
|
// just convert to a bitmap then let the DoDrawBitmap routine display it
|
||||||
//
|
//
|
||||||
if (rIcon.IsXpm())
|
if (rIcon.IsXpm())
|
||||||
{
|
{
|
||||||
|
@@ -65,24 +65,20 @@ bool wxStaticBox::Create(
|
|||||||
SetBackgroundColour(GetParent()->GetBackgroundColour());
|
SetBackgroundColour(GetParent()->GetBackgroundColour());
|
||||||
|
|
||||||
wxColour vColour;
|
wxColour vColour;
|
||||||
|
|
||||||
vColour.Set(wxString(wxT("BLACK")));
|
vColour.Set(wxString(wxT("BLACK")));
|
||||||
|
|
||||||
LONG lColor = (LONG)vColour.GetPixel();
|
LONG lColor = (LONG)vColour.GetPixel();
|
||||||
|
|
||||||
::WinSetPresParam( m_hWnd
|
::WinSetPresParam( m_hWnd
|
||||||
,PP_FOREGROUNDCOLOR
|
,PP_FOREGROUNDCOLOR
|
||||||
,sizeof(LONG)
|
,sizeof(LONG)
|
||||||
,(PVOID)&lColor
|
,(PVOID)&lColor
|
||||||
);
|
);
|
||||||
lColor = (LONG)m_backgroundColour.GetPixel();
|
|
||||||
|
|
||||||
|
lColor = (LONG)m_backgroundColour.GetPixel();
|
||||||
::WinSetPresParam( m_hWnd
|
::WinSetPresParam( m_hWnd
|
||||||
,PP_BACKGROUNDCOLOR
|
,PP_BACKGROUNDCOLOR
|
||||||
,sizeof(LONG)
|
,sizeof(LONG)
|
||||||
,(PVOID)&lColor
|
,(PVOID)&lColor
|
||||||
);
|
);
|
||||||
SetFont(*wxSMALL_FONT);
|
|
||||||
SetSize( rPos.x
|
SetSize( rPos.x
|
||||||
,rPos.y
|
,rPos.y
|
||||||
,rSize.x
|
,rSize.x
|
||||||
|
Reference in New Issue
Block a user