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

We need to switch off UI elements before they are laid out. Do this via static functions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-03-14 21:04:24 +00:00
parent 7b7c2bb40c
commit 17e0cd8845
3 changed files with 182 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/richtext/richtextsizepage.h
View File

@@ -76,23 +76,23 @@ public:
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
/// Show/hide position controls
void ShowPositionControls(bool show);
/// Show/hide position controls
static void ShowPositionControls(bool show) { sm_showPositionControls = show; }
/// Show/hide position mode controls
void ShowPositionModeControls(bool show);
static void ShowPositionModeControls(bool show) { sm_showPositionModeControls = show; }
/// Show/hide right/bottom position controls
void ShowRightBottomPositionControls(bool show);
static void ShowRightBottomPositionControls(bool show) { sm_showRightBottomPositionControls = show; }
/// Show/hide floating and alignment controls
void ShowFloatingAndAlignmentControls(bool show);
static void ShowFloatingAndAlignmentControls(bool show) { sm_showFloatingAndAlignmentControls = show; }
/// Show/hide floating controls
void ShowFloatingControls(bool show);
static void ShowFloatingControls(bool show) { sm_showFloatingControls = show; }
/// Show/hide alignment controls
void ShowAlignmentControls(bool show);
static void ShowAlignmentControls(bool show) { sm_showAlignmentControls = show; }
////@begin wxRichTextSizePage event handler declarations
@@ -156,10 +156,10 @@ public:
wxBoxSizer* m_parentSizer;
wxBoxSizer* m_floatingAlignmentSizer;
wxBoxSizer* m_floatingSizer;
wxComboBox* m_float;
wxChoice* m_float;
wxBoxSizer* m_alignmentSizer;
wxCheckBox* m_verticalAlignmentCheckbox;
wxComboBox* m_verticalAlignmentComboBox;
wxChoice* m_verticalAlignmentComboBox;
wxCheckBox* m_widthCheckbox;
wxTextCtrl* m_width;
wxComboBox* m_unitsW;
@@ -240,6 +240,13 @@ public:
ID_RICHTEXT_PARA_DOWN = 10714
};
////@end wxRichTextSizePage member variables
static bool sm_showFloatingControls;
static bool sm_showPositionControls;
static bool sm_showPositionModeControls;
static bool sm_showRightBottomPositionControls;
static bool sm_showAlignmentControls;
static bool sm_showFloatingAndAlignmentControls;
};
#endif