MinGW compilation fixes.

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index b7afa8ae6ff736a93cac94f2bd3bee60f7f9e5c8..e53b1640ab1e7f78507762fa38e824969044967c 100644 (file)
--- 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
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if 0
-#ifdef __GNUG__
-    #pragma implementation
-#endif
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "dialogbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -31,148 +29,243 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/button.h"

     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/stattext.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/stattext.h"

+    #include "wx/sizer.h"
+    #include "wx/button.h"
+    #include "wx/containr.h"

 #endif
 
 #endif
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+// wxDialogBase
+//--------------------------------------------------------------------------

 
 

-const long wxDialogBase::LAYOUT_X_MARGIN = 5;
-const long wxDialogBase::LAYOUT_Y_MARGIN = 5;
+// FIXME - temporary hack in absence of wxtopLevelWindow, should be always used
+#ifdef wxTopLevelWindowNative
+BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
+END_EVENT_TABLE()

 
 

-const long wxDialogBase::MARGIN_BETWEEN_BUTTONS = 3*LAYOUT_X_MARGIN;
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
+#endif

 
 

-// ============================================================================
-// implementation
-// ============================================================================
+void wxDialogBase::Init()
+{
+    m_returnCode = 0;

 
 

-// ----------------------------------------------------------------------------
-// dialog layout functions
-// ----------------------------------------------------------------------------
+    // the dialogs have this flag on by default to prevent the events from the
+    // dialog controls from reaching the parent frame which is usually
+    // undesirable and can lead to unexpected and hard to find bugs
+    SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
+
+#ifdef wxTopLevelWindowNative // FIXME - temporary hack, should be always used!
+    m_container.SetContainerWindow(this);
+#endif
+}
+
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL

 
 

-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));
+    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;
+    if (is_pda)
+    {
+        max_width = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
+        text += wxT('\n');
+    }
+    
+    
+    wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );

 
 

-    wxString curLine;
-    long height, width, heightTextMax = 0, widthTextMax = 0;
-    for ( const wxChar *pc = message; ; pc++ )
+    // get line height for empty lines
+    int y = 0;
+    wxFont font( GetFont() );
+    if (!font.Ok())
+        font = *wxSWISS_FONT;
+    GetTextExtent( wxT("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
+
+    size_t last_space = 0;
+    wxString line;
+    for ( size_t pos = 0; pos < text.length(); pos++ )

     {
     {

-        if ( *pc == _T('\n') || !*pc )
+        switch ( text[pos] )

         {
         {

-            dc.GetTextExtent(curLine, &width, &height);
-            if ( width > widthTextMax )
-                widthTextMax = width;
-            if ( height > heightTextMax )
-                heightTextMax = height;
+            case wxT('\n'):
+                if (!line.IsEmpty())
+                {
+                    wxStaticText *s = new wxStaticText( this, -1, line );
+                    box->Add( s );
+                    line = wxT("");
+                }
+                else
+                {
+                    box->Add( 5, y );
+                }
+                break;

 
 

-            lines->Add(curLine);
+            case wxT('&'):
+                // this is used as accel mnemonic prefix in the wxWindows
+                // 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
+                line += wxT('&');

 
 

-            if ( !*pc )
-            {
-               // the end of string
-               break;
-            }
+                // fall through to add it normally too

 
 

-            curLine.Empty();
-        }
-        else
-        {
-            curLine += *pc;
+            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 );
+                        box->Add( s );
+                        
+                        pos = last_space;
+                        last_space = 0;
+                        line = wxT("");
+                    }
+                }

         }
     }
 
         }
     }
 

-    return wxSize(widthTextMax, heightTextMax);
+    // remaining text behind last '\n'
+    if (!line.IsEmpty())
+    {
+        wxStaticText *s2 = new wxStaticText( this, -1, line );
+        box->Add( s2 );
+    }
+
+    return box;

 }
 
 }
 

-long wxDialogBase::CreateTextMessage(const wxArrayString& lines,
-                                     const wxPoint& posText,
-                                     const wxSize& sizeText)
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
+
+#if wxUSE_BUTTON
+
+wxSizer *wxDialogBase::CreateButtonSizer( long flags )

 {
 {

-    wxStaticText *text;
-    int y = posText.y;
-    size_t nLineCount = lines.GetCount();
-    for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
+    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 )

     {
     {

-        text = new wxStaticText(this, -1, lines[nLine],
-                                wxPoint(posText.x, y),
-                                sizeText);
-        y += sizeText.GetHeight();
+        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 );

 
 

-    return y;
-}
+#if defined(__WXMSW__) || defined(__WXMAC__)
+    static const int margin = 6;
+#else
+    static const int margin = 10;
+#endif

 
 

-wxSize wxDialogBase::GetStandardButtonSize(bool hasCancel)
-{
-    int wButton = 0;
-    GetTextExtent(_("OK"), &wButton, NULL);
+    wxButton *ok = (wxButton *) NULL;
+    wxButton *cancel = (wxButton *) NULL;
+    wxButton *yes = (wxButton *) NULL;
+    wxButton *no = (wxButton *) NULL;

 
 

-    if ( hasCancel )
+    // always show an OK button, unless we have both YES and NO
+    if ( (flags & wxYES_NO) != wxYES_NO )
+        flags |= wxOK;
+
+    if (flags & wxYES)

     {
     {

-        int width;
-        GetTextExtent(_("Cancel"), &width, NULL);
-        if ( width > wButton )
-            wButton = width;
+        yes = new wxButton( this, wxID_YES, _("Yes"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
+        inner_yes_no->Add( yes, 0, wxLEFT|wxRIGHT, margin );

     }
     }

-
-    if ( wButton < 75 )
+    if (flags & wxNO)

     {
     {

-        // the minimal acceptable width
-        wButton = 75;
+        no = new wxButton( this, wxID_NO, _("No"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
+        inner_yes_no->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"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
+        inner_rest->Add( ok, 0, wxLEFT|wxRIGHT, margin );

     }
 
     }
 

-    // a nice looking proportion
-    int hButton = (wButton * 23) / 75;
+    if (flags & wxFORWARD)
+        inner_rest->Add( new wxButton( this, wxID_FORWARD, _("Forward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
 

-    return wxSize(wButton, hButton);
-}
+    if (flags & wxBACKWARD)
+        inner_rest->Add( new wxButton( this, wxID_BACKWARD, _("Backward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 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)
+        inner_rest->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
 

-    long x = wDialog / 2;
-    if ( hasCancel )
-        x -= MARGIN_BETWEEN_BUTTONS / 2 + wButton;
-    else
-        x -= wButton / 2;
+    if (flags & wxMORE)
+        inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
 

-    ok = new wxButton( this, wxID_OK, _("OK"),
-                       wxPoint(x, y),
-                       wxSize(wButton, hButton) );
+    if (flags & wxHELP)
+        inner_rest->Add( new wxButton( this, wxID_HELP, _("Help"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 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"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
+        inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );

     }
 
     }
 

-    ok->SetDefault();
-    ok->SetFocus();
-}
+    // choose the default button
+    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;

 }
 }

+
+#endif // wxUSE_BUTTON