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

use platform-specific styles in xTR_DEFAULT_STYLE but don't impose them forcefully in wxGenericTreeCtrl ctor as this prevents people from using them even if they explicitly want to do it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-12 23:06:09 +00:00
parent 522a028a17
commit 6621957fe2
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/treebase.h
View File

@@ -175,10 +175,15 @@ enum wxTreeItemIcon
#define wxTR_FULL_ROW_HIGHLIGHT 0x2000 // highlight full horz space #define wxTR_FULL_ROW_HIGHLIGHT 0x2000 // highlight full horz space
#ifdef __WXGTK20__ // make the default control appearance look more native-like depending on the
#define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_NO_LINES) // platform
#if defined(__WXGTK20__)
#define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_NO_LINES)
#elif defined(__WXMAC__)
#define wxTR_DEFAULT_STYLE \
(wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_FULL_ROW_HIGHLIGHT)
#else #else
#define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT) #define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
#endif #endif
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6

13
src/generic/treectlg.cpp
View File

@@ -802,21 +802,12 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
const wxString& name ) const wxString& name )
{ {
#ifdef __WXMAC__ #ifdef __WXMAC__
int major,minor; int major, minor;
wxGetOsVersion( &major, &minor ); wxGetOsVersion(&major, &minor);
style &= ~wxTR_LINES_AT_ROOT;
style |= wxTR_NO_LINES;
if (major < 10) if (major < 10)
style |= wxTR_ROW_LINES; style |= wxTR_ROW_LINES;
if (style == 0 || style & wxTR_DEFAULT_STYLE)
style |= wxTR_FULL_ROW_HIGHLIGHT;
#endif // __WXMAC__ #endif // __WXMAC__
#ifdef __WXGTK20__
style |= wxTR_NO_LINES;
#endif
if ( !wxControl::Create( parent, id, pos, size, if ( !wxControl::Create( parent, id, pos, size,
style|wxHSCROLL|wxVSCROLL, style|wxHSCROLL|wxVSCROLL,