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

Tidying

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-13 12:17:25 +00:00
parent dc797d8e1b
commit 28319afe55
3 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/vlbox.h
View File

@@ -202,7 +202,7 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected: protected:
virtual wxBorder GetDefaultBorder() const { return GetDefaultBorderForControl(); } virtual wxBorder GetDefaultBorder() const { return wxBORDER_THEME; }
// the derived class must implement this function to actually draw the item // the derived class must implement this function to actually draw the item
// with the given index on the provided DC // with the given index on the provided DC

2
src/msw/control.cpp
View File

@@ -246,8 +246,6 @@ wxSize wxControl::DoGetBestSize() const
wxBorder wxControl::GetDefaultBorder() const wxBorder wxControl::GetDefaultBorder() const
{ {
return wxControlBase::GetDefaultBorder(); return wxControlBase::GetDefaultBorder();
// return GetDefaultBorderForControl();
} }
// This is a helper for all wxControls made with UPDOWN native control. // This is a helper for all wxControls made with UPDOWN native control.

19
src/msw/window.cpp
View File

@@ -1288,28 +1288,11 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
wxBorder wxWindowMSW::GetDefaultBorderForControl() const wxBorder wxWindowMSW::GetDefaultBorderForControl() const
{ {
// we want to automatically give controls a sunken style (confusingly, return wxBORDER_THEME;
// it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
// which is not sunken at all under Windows XP -- rather, just the default)
#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
return wxBORDER_SIMPLE;
#else
#if wxUSE_UXTHEME
if (CanApplyThemeBorder())
{
wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
if (theme)
return wxBORDER_THEME;
}
#endif
return wxBORDER_SUNKEN;
#endif
} }
wxBorder wxWindowMSW::GetDefaultBorder() const wxBorder wxWindowMSW::GetDefaultBorder() const
{ {
// return GetDefaultBorderForControl();
return wxWindowBase::GetDefaultBorder(); return wxWindowBase::GetDefaultBorder();
} }