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

Added wxBORDER_THEME and made wxTextCtrl and wxSearchCtrl show the correct borders. Because

Browse Source 
we can't add virtual functions because of binary compatibility considerations, we can't make
controls intelligent enough to know when they need themed borders. So in 2.8 we have to add
wxBORDER_THEME explicitly where necessary.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-07 19:40:08 +00:00
parent 931e5c417c
commit 2ee1e5bbb0
4 changed files with 125 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/srchctlg.cpp
View File

@@ -30,6 +30,10 @@
#include "wx/image.h"
#if defined(__WXMSW__) && wxUSE_UXTHEME
#include "wx/msw/uxtheme.h"
#endif
#define WXMAX(a,b) ((a)>(b)?(a):(b))
// ----------------------------------------------------------------------------
@@ -321,11 +325,16 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name)
{
#ifdef __WXGTK__
if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSUNKEN_BORDER | (style & ~wxBORDER_MASK), validator, name) )
#else
if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | (style & ~wxBORDER_MASK), validator, name) )
int borderStyle = wxBORDER_SIMPLE;
#if defined(__WXMSW__) && wxUSE_UXTHEME && !(defined(__POCKETPC__) || defined(__SMARTPHONE__))
if (wxUxThemeEngine::GetIfActive())
borderStyle = wxBORDER_THEME;
#elif defined(__WXGTK__)
borderStyle = wxBORDER_SUNKEN;
#endif
if ( !wxTextCtrlBase::Create(parent, id, pos, size, borderStyle | (style & ~wxBORDER_MASK), validator, name) )
{
return false;
}