use TWIST buttons by default on the Mac, but also make it possible to
skip the style adjustments so the programmer can do what they want too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
%rename(TL_SEARCH_FULL) wxTL_SEARCH_FULL;
|
||||
%rename(TL_SEARCH_PARTIAL) wxTL_SEARCH_PARTIAL;
|
||||
%rename(TL_SEARCH_NOCASE) wxTL_SEARCH_NOCASE;
|
||||
%rename(TR_DONT_ADJUST_MAC) wxTR_DONT_ADJUST_MAC;
|
||||
%rename(TreeListColumnInfo) wxTreeListColumnInfo;
|
||||
|
||||
#endif
|
||||
|
@@ -40,8 +40,8 @@
|
||||
|
||||
%import windows.i
|
||||
%import controls.i
|
||||
%pythoncode { wx = _core }
|
||||
%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
|
||||
%pythoncode { import wx }
|
||||
%pythoncode { __docfilter__ = wx._core.__DocFilter(globals()) }
|
||||
|
||||
|
||||
MAKE_CONST_WXSTRING2(DynamicSashNameStr, wxT("dynamicSashWindow"));
|
||||
@@ -443,6 +443,11 @@ enum {
|
||||
wxTL_SEARCH_NOCASE
|
||||
};
|
||||
|
||||
enum {
|
||||
// extra tree styles
|
||||
wxTR_DONT_ADJUST_MAC
|
||||
};
|
||||
%pythoncode { wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC }
|
||||
|
||||
|
||||
class wxTreeListColumnInfo: public wxObject {
|
||||
|
@@ -44,6 +44,9 @@ typedef void *wxTreeItemIdValue;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#define wxTR_DONT_ADJUST_MAC 0x0100 // Don't adjust the style for the Mac
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxTreeListColumnAttrs
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -1868,17 +1868,20 @@ bool wxTreeListMainWindow::Create(wxTreeListCtrl *parent,
|
||||
const wxString& name )
|
||||
{
|
||||
#ifdef __WXMAC__
|
||||
int major,minor;
|
||||
wxGetOsVersion( &major, &minor );
|
||||
if ( !(style & wxTR_DONT_ADJUST_MAC))
|
||||
{
|
||||
int major,minor;
|
||||
wxGetOsVersion( &major, &minor );
|
||||
|
||||
if (style & wxTR_HAS_BUTTONS) style |= wxTR_MAC_BUTTONS;
|
||||
if (style & wxTR_HAS_BUTTONS) style &= ~wxTR_HAS_BUTTONS;
|
||||
style &= ~wxTR_LINES_AT_ROOT;
|
||||
style |= wxTR_NO_LINES;
|
||||
if (major < 10)
|
||||
style |= wxTR_ROW_LINES;
|
||||
if (style & wxTR_HAS_BUTTONS) style |= wxTR_TWIST_BUTTONS;
|
||||
if (style & wxTR_HAS_BUTTONS) style &= ~wxTR_HAS_BUTTONS;
|
||||
style &= ~wxTR_LINES_AT_ROOT;
|
||||
style |= wxTR_NO_LINES;
|
||||
if (major < 10)
|
||||
style |= wxTR_ROW_LINES;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
wxScrolledWindow::Create( parent, id, pos, size,
|
||||
style|wxHSCROLL|wxVSCROLL, name );
|
||||
|
||||
|
Reference in New Issue
Block a user