X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e37feda24583de5c87e1c4099459f83ffa852fec..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index c708a96e25..73d1bcd7dc 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -17,10 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if 0
 #ifdef __GNUG__
-    #pragma implementation
-#endif
+    #pragma implementation "dialogbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -33,144 +31,143 @@
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
+    #include "wx/intl.h"
     #include "wx/settings.h"
+    #include "wx/stattext.h"
+    #include "wx/sizer.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-const long wxDialogBase::LAYOUT_X_MARGIN = 5;
-const long wxDialogBase::LAYOUT_Y_MARGIN = 5;
-
-const long wxDialogBase::MARGIN_BETWEEN_BUTTONS = 3*LAYOUT_X_MARGIN;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// dialog layout functions
-// ----------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+// wxDialogBase
+//--------------------------------------------------------------------------
 
-wxSize wxDialogBase::SplitTextMessage(const wxString& message,
-                                      wxArrayString *lines)
+wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 {
-    wxClientDC dc(this);
-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
+
+    // get line height for empty lines
+    int y = 0;
+    wxFont new_font( GetFont() );
+    if (!new_font.Ok()) new_font = *wxSWISS_FONT;
+    GetTextExtent( "H", (int*)NULL, &y, (int*)NULL, (int*)NULL, &new_font );
 
-    wxString curLine;
-    long height, width, heightTextMax = 0, widthTextMax = 0;
-    for ( const wxChar *pc = message; ; pc++ )
+    wxString line;
+    for (size_t pos = 0; pos < message.Len(); pos++)
     {
-        if ( *pc == _T('\n') || !*pc )
+        if (message[pos] == wxT('\n'))
         {
-            dc.GetTextExtent(curLine, &width, &height);
-            if ( width > widthTextMax )
-                widthTextMax = width;
-            if ( height > heightTextMax )
-                heightTextMax = height;
-
-            lines->Add(curLine);
-
-            if ( !*pc )
+            if (!line.IsEmpty())
             {
-               // the end of string
-               break;
+                wxStaticText *s1 = new wxStaticText( this, -1, line );
+		box->Add( s1 );
+                line = wxT("");
             }
-
-            curLine.Empty();
+	    else
+	    {
+	        box->Add( 5, y );
+	    }
         }
         else
         {
-            curLine += *pc;
+            line += message[pos];
         }
     }
 
-    return wxSize(widthTextMax, heightTextMax);
-}
-
-long wxDialogBase::CreateTextMessage(const wxArrayString& lines,
-                                     const wxPoint& posText,
-                                     const wxSize& sizeText)
-{
-    wxStaticText *text;
-    int y = posText.y;
-    size_t nLineCount = lines.GetCount();
-    for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
+    // remaining text behind last '\n'
+    if (!line.IsEmpty())
     {
-        text = new wxStaticText(this, -1, lines[nLine],
-                                wxPoint(posText.x, y),
-                                sizeText);
-        y += sizeText.GetHeight();
+        wxStaticText *s2 = new wxStaticText( this, -1, line );
+	box->Add( s2 );
     }
 
-    return y;
+    return box;
 }
 
-wxSize wxDialogBase::GetStandardButtonSize(bool hasCancel)
+wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {
-    int wButton = 0;
-    GetTextExtent(_("OK"), &wButton, NULL);
+    wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL );
 
-    if ( hasCancel )
-    {
-        int width;
-        GetTextExtent(_("Cancel"), &width, NULL);
-        if ( width > wButton )
-            wButton = width;
-    }
+#if defined(__WXMSW__) || defined(__WXMAC__)
+    int margin = 6;
+#else
+    int margin = 10;
+#endif
+
+    wxButton *ok = (wxButton *) NULL;
+    wxButton *cancel = (wxButton *) NULL;
+    wxButton *yes = (wxButton *) NULL;
+    wxButton *no = (wxButton *) NULL;
 
-    if ( wButton < 75 )
+    // always show an OK button, unless only YES_NO is given
+    if ((flags & wxYES_NO) == 0) flags = flags | wxOK;
+
+    if (flags & wxYES_NO)
+    {
+        yes = new wxButton( this, wxID_YES, _("Yes") );
+        box->Add( yes, 0, wxLEFT|wxRIGHT, margin );
+        no = new wxButton( this, wxID_NO, _("No") );
+        box->Add( no, 0, wxLEFT|wxRIGHT, margin );
+    } else
+    if (flags & wxYES)
+    {
+        yes = new wxButton( this, wxID_YES, _("Yes") );
+        box->Add( yes, 0, wxLEFT|wxRIGHT, margin );
+    } else
+    if (flags & wxNO)
     {
-        // the minimal acceptable width
-        wButton = 75;
+        no = new wxButton( this, wxID_NO, _("No") );
+        box->Add( no, 0, wxLEFT|wxRIGHT, margin );
     }
-    else
+
+    if (flags & wxOK)
     {
-        // the width of the button is not just the width of the label...
-        wButton += 2*LAYOUT_X_MARGIN;
+        ok = new wxButton( this, wxID_OK, _("OK") );
+        box->Add( ok, 0, wxLEFT|wxRIGHT, margin );
     }
 
-    // a nice looking proportion
-    int hButton = (wButton * 23) / 75;
+    if (flags & wxFORWARD)
+        box->Add( new wxButton( this, wxID_FORWARD, _("Forward")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    return wxSize(wButton, hButton);
-}
+    if (flags & wxBACKWARD)
+        box->Add( new wxButton( this, wxID_BACKWARD, _("Backward")  ), 0, wxLEFT|wxRIGHT, margin );
 
-void wxDialogBase::CreateStandardButtons(long wDialog,
-                                         long y,
-                                         long wButton,
-                                         long hButton,
-                                         bool hasCancel)
-{
-    // NB: create [Ok] first to get the right tab order
-    wxButton *ok = (wxButton *) NULL;
-    wxButton *cancel = (wxButton *) NULL;
+    if (flags & wxSETUP)
+        box->Add( new wxButton( this, wxID_SETUP, _("Setup")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    long x = wDialog / 2;
-    if ( hasCancel )
-        x -= MARGIN_BETWEEN_BUTTONS / 2 + wButton;
-    else
-        x -= wButton / 2;
+    if (flags & wxMORE)
+        box->Add( new wxButton( this, wxID_MORE, _("More...")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    ok = new wxButton( this, wxID_OK, _("OK"),
-                       wxPoint(x, y),
-                       wxSize(wButton, hButton) );
+    if (flags & wxHELP)
+        box->Add( new wxButton( this, wxID_HELP, _("Help")  ), 0, wxLEFT|wxRIGHT, margin );
 
-    if ( hasCancel )
+    if (flags & wxCANCEL)
     {
-        x += MARGIN_BETWEEN_BUTTONS + wButton;
-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),
-                               wxPoint(x, y),
-                               wxSize(wButton, hButton) );
+        cancel = new wxButton( this, wxID_CANCEL, _("Cancel") );
+        box->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
     }
 
-    ok->SetDefault();
-    ok->SetFocus();
-}
+    if (flags & wxNO_DEFAULT)
+    {
+        if (no)
+        {
+            no->SetDefault();
+            no->SetFocus();
+        }
+    }
+    else
+    {
+        if (ok)
+        {
+            ok->SetDefault();
+            ok->SetFocus();
+        }
+        else if (yes)
+        {
+            yes->SetDefault();
+            yes->SetFocus();
+        }
+    }
 
-long wxDialogBase::GetStandardTextHeight()
-{
-    return (3*GetCharHeight()) / 2;
+    return box;
 }
+