// Created: 28.06.99
// RCS-ID: $Id$
// Copyright: (c) Vadim Zeitlin
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dialogbase.h"
#endif
#endif
}
-#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
{
bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-
+
wxString text = message;
-
+
// I admit that this is complete bogus, but it makes
// message boxes work for pda screens temporarily..
int max_width = -1;
max_width = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
text += wxT('\n');
}
-
-
+
+
wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
// get line height for empty lines
switch ( text[pos] )
{
case wxT('\n'):
- if (!line.IsEmpty())
+ if (!line.empty())
{
- wxStaticText *s = new wxStaticText( this, -1, line );
+ wxStaticText *s = new wxStaticText( this, wxID_ANY, line );
box->Add( s );
- line = wxT("");
+ line = wxEmptyString;
}
else
{
break;
case wxT('&'):
- // this is used as accel mnemonic prefix in the wxWindows
+ // this is used as accel mnemonic prefix in the wxWidgets
// controls but in the static messages created by
// CreateTextSizer() (used by wxMessageBox, for example), we
// don't want this special meaning, so we need to quote it
default:
if (text[pos] == wxT(' '))
last_space = pos;
-
+
line += message[pos];
-
+
if (is_pda)
{
int width = 0;
GetTextExtent( line, &width, (int*)NULL, (int*)NULL, (int*)NULL, &font );
-
+
if (width > max_width)
{
// exception if there was no previous space
if (last_space == 0)
last_space = pos;
-
+
int diff = pos-last_space;
int len = line.Len();
line.Remove( len-diff, diff );
-
- wxStaticText *s = new wxStaticText( this, -1, line );
+
+ wxStaticText *s = new wxStaticText( this, wxID_ANY, line );
box->Add( s );
-
+
pos = last_space;
last_space = 0;
- line = wxT("");
+ line = wxEmptyString;
}
}
}
}
// remaining text behind last '\n'
- if (!line.IsEmpty())
+ if (!line.empty())
{
- wxStaticText *s2 = new wxStaticText( this, -1, line );
+ wxStaticText *s2 = new wxStaticText( this, wxID_ANY, line );
box->Add( s2 );
}
return box;
}
-#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
#if wxUSE_BUTTON
wxSizer *wxDialogBase::CreateButtonSizer( long flags )
{
- bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-
- wxBoxSizer *box = NULL;
-
- // If we have a PDA screen, put yes/no button over
- // all other buttons, otherwise on the left side.
- if (is_pda)
- box = new wxBoxSizer( wxVERTICAL );
- else
- box = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer *inner_yes_no = NULL;
-
- // Only create sizer containing yes/no
- // if it is actually required
- if ( (flags & wxYES_NO) != 0 )
- {
- inner_yes_no = new wxBoxSizer( wxHORIZONTAL );
- box->Add( inner_yes_no, 0, wxBOTTOM, 10 );
- }
-
- wxBoxSizer *inner_rest = new wxBoxSizer( wxHORIZONTAL );
- box->Add( inner_rest, 0, 0, 0 );
-
-#if defined(__WXMSW__) || defined(__WXMAC__)
- static const int margin = 6;
-#else
- static const int margin = 10;
-#endif
-
- wxButton *ok = (wxButton *) NULL;
- wxButton *cancel = (wxButton *) NULL;
- wxButton *yes = (wxButton *) NULL;
- wxButton *no = (wxButton *) NULL;
-
- // always show an OK button, unless we have both YES and NO
- if ( (flags & wxYES_NO) != wxYES_NO )
- flags |= wxOK;
+ return CreateStdDialogButtonSizer( flags );
+}
- if (flags & wxYES)
- {
- yes = new wxButton( this, wxID_YES, _("Yes"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
- inner_yes_no->Add( yes, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
- }
- if (flags & wxNO)
- {
- no = new wxButton( this, wxID_NO, _("No"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
- inner_yes_no->Add( no, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
+{
+ wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer();
+ wxButton *ok = NULL;
+ wxButton *yes = NULL;
+ wxButton *no = NULL;
+
+ if (flags & wxOK){
+ ok = new wxButton(this, wxID_OK);
+ sizer->AddButton(ok);
}
- if (flags & wxOK)
- {
- ok = new wxButton( this, wxID_OK, _("OK"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
- inner_rest->Add( ok, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+ if (flags & wxCANCEL){
+ wxButton *cancel = new wxButton(this, wxID_CANCEL);
+ sizer->AddButton(cancel);
}
- if (flags & wxFORWARD)
- inner_rest->Add( new wxButton( this, wxID_FORWARD, _("Forward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
-
- if (flags & wxBACKWARD)
- inner_rest->Add( new wxButton( this, wxID_BACKWARD, _("Backward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
-
- if (flags & wxSETUP)
- inner_rest->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
-
- if (flags & wxMORE)
- inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+ if (flags & wxYES){
+ yes = new wxButton(this, wxID_YES);
+ sizer->AddButton(yes);
+ }
- if (flags & wxHELP)
- inner_rest->Add( new wxButton( this, wxID_HELP, _("Help"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+ if (flags & wxNO){
+ no = new wxButton(this, wxID_NO);
+ sizer->AddButton(no);
+ }
- if (flags & wxCANCEL)
- {
- cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
- inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+ if (flags & wxHELP){
+ wxButton *help = new wxButton(this, wxID_HELP);
+ sizer->AddButton(help);
}
- // choose the default button
+ sizer->Finalise();
+
if (flags & wxNO_DEFAULT)
{
if (no)
}
}
- return box;
+ return sizer;
}
+
#endif // wxUSE_BUTTON
projects / wxWidgets.git / blobdiff