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

Allow specifying the maximum width of static text in dialogs

Browse Source 
This patch allows specification of the maximum width of static texts
created with wxDialog::CreateTextSizer.

The patch preserves backwards compatibility by setting the previous
width value as the default argument value.

Closes https://github.com/wxWidgets/wxWidgets/pull/355
This commit is contained in:
Tobias Schlager
2016-12-01 09:43:29 +01:00
committed by Vadim Zeitlin
parent aad8663698
commit 73f6f622f9
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/dialog.h
View File

@@ -116,13 +116,15 @@ public:
#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL #if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
// splits text up at newlines and places the lines into a vertical // splits text up at newlines and places the lines into a vertical
// wxBoxSizer // wxBoxSizer, with the given maximum width, lines will not be wrapped
wxSizer *CreateTextSizer( const wxString& message ); // for negative values of widthMax
wxSizer *CreateTextSizer(const wxString& message, int widthMax = -1);
// same as above but uses a customized wxTextSizerWrapper to create // same as above but uses a customized wxTextSizerWrapper to create
// non-standard controls for the lines // non-standard controls for the lines
wxSizer *CreateTextSizer( const wxString& message, wxSizer *CreateTextSizer(const wxString& message,
wxTextSizerWrapper& wrapper ); wxTextSizerWrapper& wrapper,
int widthMax = -1);
#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL #endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
// returns a horizontal wxBoxSizer containing the given buttons // returns a horizontal wxBoxSizer containing the given buttons

10
interface/wx/dialog.h
View File

@@ -292,9 +292,15 @@ public:
/** /**
Splits text up at newlines and places the lines into wxStaticText Splits text up at newlines and places the lines into wxStaticText
objects in a vertical wxBoxSizer. objects with the specified maximum width in a vertical wxBoxSizer.
@a widthMax is available since 3.1.0
@param widthMax Specifies the text's maximum width.
@see wxStaticText::Wrap(int width)
*/ */
wxSizer *CreateTextSizer( const wxString& message ); wxSizer *CreateTextSizer(const wxString& message, int widthMax = -1);
/** /**
Performs layout adaptation, usually if the dialog is too large to fit Performs layout adaptation, usually if the dialog is too large to fit

8
src/common/dlgcmn.cpp
View File

@@ -196,19 +196,19 @@ wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const
#if wxUSE_STATTEXT #if wxUSE_STATTEXT
wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) wxSizer *wxDialogBase::CreateTextSizer(const wxString& message, int widthMax)
{ {
wxTextSizerWrapper wrapper(this); wxTextSizerWrapper wrapper(this);
return CreateTextSizer(message, wrapper); return CreateTextSizer(message, wrapper, widthMax);
} }
wxSizer *wxDialogBase::CreateTextSizer(const wxString& message, wxSizer *wxDialogBase::CreateTextSizer(const wxString& message,
wxTextSizerWrapper& wrapper) wxTextSizerWrapper& wrapper,
int widthMax)
{ {
// I admit that this is complete bogus, but it makes // I admit that this is complete bogus, but it makes
// message boxes work for pda screens temporarily.. // message boxes work for pda screens temporarily..
int widthMax = -1;
const bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA; const bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA;
if (is_pda) if (is_pda)
{ {