X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e1265174571765b279434383788a52832b5992b4:/src/common/dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index f5576a7af1..ca535d37d2 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -72,9 +72,9 @@ void wxDialogBase::Init()
 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;
@@ -83,8 +83,8 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
         max_width = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
         text += wxT('\n');
     }
-    
-    
+
+
     wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
 
     // get line height for empty lines
@@ -101,11 +101,11 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
         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
                 {
@@ -125,39 +125,39 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
             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 );
     }
 
@@ -170,78 +170,43 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 
 wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {
-    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-    
-    // If we have a PDA screen, put yes/no button over 
-    // all other buttons, otherwise on the left side.
-    wxBoxSizer *box = is_pda ? new wxBoxSizer( wxVERTICAL ) : 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 *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, margin );
-    }
-    if (flags & wxNO)
-    {
-        no = new wxButton( this, wxID_NO, _("No"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        inner_yes_no->Add( no, 0, wxLEFT|wxRIGHT, 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, 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, margin );
-
-    if (flags & wxBACKWARD)
-        inner_rest->Add( new wxButton( this, wxID_BACKWARD, _("Backward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
-
-    if (flags & wxSETUP)
-        inner_rest->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
-
-    if (flags & wxMORE)
-        inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, 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, margin );
+    if (flags & wxNO){
+        no = new wxButton(this, wxID_NO);
+        sizer->AddButton(no);
+    }
 
-    if (flags & wxCANCEL)
-    {
-        wxButton *cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
+    if (flags & wxHELP){
+        wxButton *help = new wxButton(this, wxID_HELP);
+        sizer->AddButton(help);
     }
 
-    // choose the default button
+    sizer->Realize();
+
     if (flags & wxNO_DEFAULT)
     {
         if (no)
@@ -264,7 +229,8 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
         }
     }
 
-    return box;
+    return sizer;
 }
 
+
 #endif // wxUSE_BUTTON