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

More style fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-26 22:59:24 +00:00
parent 6bf9dc1356
commit 6e537cd2e2
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/slider95.cpp
View File

@@ -72,9 +72,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
SetBackgroundColour(parent->GetBackgroundColour()) ; SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ; SetForegroundColour(parent->GetForegroundColour()) ;
m_staticValue = (WXHWND) NULL;; m_staticValue = (WXHWND) NULL;
m_staticMin = (WXHWND) NULL;; m_staticMin = (WXHWND) NULL;
m_staticMax = (WXHWND) NULL;; m_staticMax = (WXHWND) NULL;
m_pageSize = 1; m_pageSize = 1;
m_lineSize = 1; m_lineSize = 1;
m_windowStyle = style; m_windowStyle = style;
@@ -98,7 +98,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
msStyle |= SS_CENTER; msStyle |= SS_CENTER;
WXDWORD exStyle = 0; WXDWORD exStyle = 0;
msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ; long valueStyle = m_windowStyle & ~wxBORDER_MASK;
valueStyle |= wxBORDER_SUNKEN;
msStyle |= MSWGetStyle(valueStyle, & exStyle) ;
m_staticValue = (WXHWND) CreateWindowEx m_staticValue = (WXHWND) CreateWindowEx
( (

6
src/msw/tglbtn.cpp
View File

@@ -73,6 +73,12 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
// default border for this control is none
if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
{
style |= wxBORDER_NONE;
}
if (!CreateBase(parent, id, pos, size, style, validator, name)) if (!CreateBase(parent, id, pos, size, style, validator, name))
return FALSE; return FALSE;