fixed signature of wxTimerProc to be conformant to what Windows expects it to be

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 04ad2b6756b2973c012c2f2c44eb872c63add18c..b599012aa5b52380e3ea20b27e5c7fbbdc17037c 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,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dialogbase.h"
 #endif
 
     #pragma implementation "dialogbase.h"
 #endif
 


@@ -40,7 +40,6 @@
     #include "wx/containr.h"
 #endif
 
     #include "wx/containr.h"
 #endif
 

-

 //--------------------------------------------------------------------------
 // wxDialogBase
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
 // wxDialogBase
 //--------------------------------------------------------------------------


@@ -68,10 +67,24 @@ void wxDialogBase::Init()
 #endif
 }
 
 #endif
 }
 

-#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL

 
 wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 {
 
 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;
+    if (is_pda)
+    {
+        max_width = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
+        text += wxT('\n');
+    }
+
+

     wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
 
     // get line height for empty lines
     wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
 
     // get line height for empty lines


@@ -79,18 +92,19 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
     wxFont font( GetFont() );
     if (!font.Ok())
         font = *wxSWISS_FONT;
     wxFont font( GetFont() );
     if (!font.Ok())
         font = *wxSWISS_FONT;

-    GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
+    GetTextExtent( wxT("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);

 
 

+    size_t last_space = 0;

     wxString line;
     wxString line;

-    for ( size_t pos = 0; pos < message.length(); pos++ )
+    for ( size_t pos = 0; pos < text.length(); pos++ )

     {
     {

-        switch ( message[pos] )
+        switch ( text[pos] )

         {
         {

-            case _T('\n'):
+            case wxT('\n'):

                 if (!line.IsEmpty())
                 {
                 if (!line.IsEmpty())
                 {

-                    wxStaticText *s1 = new wxStaticText( this, -1, line );
-                    box->Add( s1 );
+                    wxStaticText *s = new wxStaticText( this, wxID_ANY, line );
+                    box->Add( s );

                     line = wxT("");
                 }
                 else
                     line = wxT("");
                 }
                 else


@@ -99,37 +113,81 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
                 }
                 break;
 
                 }
                 break;
 

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

 
                 // fall through to add it normally too
 
             default:
 
                 // fall through to add it normally too
 
             default:

+                if (text[pos] == wxT(' '))
+                    last_space = pos;
+

                 line += message[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, wxID_ANY, line );
+                        box->Add( s );
+
+                        pos = last_space;
+                        last_space = 0;
+                        line = wxT("");
+                    }
+                }

         }
     }
 
     // remaining text behind last '\n'
     if (!line.IsEmpty())
     {
         }
     }
 
     // remaining text behind last '\n'
     if (!line.IsEmpty())
     {

-        wxStaticText *s2 = new wxStaticText( this, -1, line );
+        wxStaticText *s2 = new wxStaticText( this, wxID_ANY, line );

         box->Add( s2 );
     }
 
     return box;
 }
 
         box->Add( s2 );
     }
 
     return box;
 }
 

-#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL

 
 #if wxUSE_BUTTON
 
 wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {
 
 #if wxUSE_BUTTON
 
 wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {

-    wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL );
+    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;
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
     static const int margin = 6;


@@ -138,58 +196,66 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 #endif
 
     wxButton *ok = (wxButton *) NULL;
 #endif
 
     wxButton *ok = (wxButton *) NULL;

-    wxButton *cancel = (wxButton *) NULL;

     wxButton *yes = (wxButton *) NULL;
     wxButton *no = (wxButton *) NULL;
 
     wxButton *yes = (wxButton *) NULL;
     wxButton *no = (wxButton *) NULL;
 

-    // always show an OK button, unless only YES_NO is given
-    if ((flags & wxYES_NO) == 0) flags = flags | wxOK;
+    // always show an OK button, unless we have both YES and NO
+    if ( (flags & wxYES_NO) != wxYES_NO )
+        flags |= wxOK;

 
 

-    if (flags & wxYES_NO)
-    {
-        yes = new wxButton( this, wxID_YES, _("Yes"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        box->Add( yes, 0, wxLEFT|wxRIGHT, margin );
-        no = new wxButton( this, wxID_NO, _("No") ,wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS);
-        box->Add( no, 0, wxLEFT|wxRIGHT, margin );
-    } else

     if (flags & wxYES)
     {
     if (flags & wxYES)
     {

-        yes = new wxButton( this, wxID_YES, _("Yes"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        box->Add( yes, 0, wxLEFT|wxRIGHT, margin );
-    } else
+        yes = new wxButton(this, wxID_YES, wxEmptyString,
+                           wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS);
+        inner_yes_no->Add( yes, 0, wxLEFT|wxRIGHT, margin );
+    }

     if (flags & wxNO)
     {
     if (flags & wxNO)
     {

-        no = new wxButton( this, wxID_NO, _("No"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        box->Add( no, 0, wxLEFT|wxRIGHT, margin );
+        no = new wxButton(this, wxID_NO, wxEmptyString,
+                          wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS);
+        inner_yes_no->Add( no, 0, wxLEFT|wxRIGHT, margin );

     }
 
     if (flags & wxOK)
     {
     }
 
     if (flags & wxOK)
     {

-        ok = new wxButton( this, wxID_OK, _("OK"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        box->Add( ok, 0, wxLEFT|wxRIGHT, margin );
+        ok = new wxButton(this, wxID_OK, wxEmptyString,
+                          wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS);
+        inner_rest->Add( ok, 0, wxLEFT|wxRIGHT, margin );

     }
 
     if (flags & wxFORWARD)
     }
 
     if (flags & wxFORWARD)

-        box->Add( new wxButton( this, wxID_FORWARD, _("Forward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
+        inner_rest->Add(new wxButton(this, wxID_FORWARD, wxEmptyString,
+                                     wxDefaultPosition, wxDefaultSize,
+                                     wxCLIP_SIBLINGS),
+                        0, wxLEFT|wxRIGHT, margin);

 
     if (flags & wxBACKWARD)
 
     if (flags & wxBACKWARD)

-        box->Add( new wxButton( this, wxID_BACKWARD, _("Backward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
+        inner_rest->Add(new wxButton(this, wxID_BACKWARD, wxEmptyString,
+                                     wxDefaultPosition, wxDefaultSize,
+                                     wxCLIP_SIBLINGS),
+                        0, wxLEFT|wxRIGHT, margin);

 
     if (flags & wxSETUP)
 
     if (flags & wxSETUP)

-        box->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
+        inner_rest->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxMORE)
 
     if (flags & wxMORE)

-        box->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
+        inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxHELP)
 
     if (flags & wxHELP)

-        box->Add( new wxButton( this, wxID_HELP, _("Help"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );
+        inner_rest->Add(new wxButton(this, wxID_HELP, wxEmptyString,
+                                     wxDefaultPosition, wxDefaultSize,
+                                     wxCLIP_SIBLINGS),
+                        0, wxLEFT|wxRIGHT, margin);

 
     if (flags & wxCANCEL)
     {
 
     if (flags & wxCANCEL)
     {

-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
-        box->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
+        wxButton *cancel = new wxButton(this, wxID_CANCEL, wxEmptyString,
+                                        wxDefaultPosition, wxDefaultSize,
+                                        wxCLIP_SIBLINGS);
+        inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );

     }
 
     }
 

+    // choose the default button

     if (flags & wxNO_DEFAULT)
     {
         if (no)
     if (flags & wxNO_DEFAULT)
     {
         if (no)