Applied patch [ 1117207 ] changed the test for SQL_C_WCHAR

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 5a83e468893edb2d7bd8dc486d15f7bbd69aac63..f810b795a413196af0015f7de55a079f2d996003 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -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
 


@@ -67,14 +67,14 @@ void wxDialogBase::Init()
 #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);
 
 wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 {
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

-    
+

     wxString text = message;
     wxString text = message;

-    
+

     // I admit that this is complete bogus, but it makes
     // message boxes work for pda screens temporarily..
     int max_width = -1;
     // 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');
     }
         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


@@ -101,11 +101,11 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
         switch ( text[pos] )
         {
             case wxT('\n'):
         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 );
                     box->Add( s );

-                    line = wxT("");
+                    line = wxEmptyString;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -114,7 +114,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
                 break;
 
             case wxT('&'):
                 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
                 // 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


@@ -125,129 +125,88 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
             default:
                 if (text[pos] == wxT(' '))
                     last_space = pos;
             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 (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;
                     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 );
                         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 );
                         box->Add( s );

-                        
+

                         pos = last_space;
                         last_space = 0;
                         pos = last_space;
                         last_space = 0;

-                        line = wxT("");
+                        line = wxEmptyString;

                     }
                 }
         }
     }
 
     // remaining text behind last '\n'
                     }
                 }
         }
     }
 
     // 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;
 }
 
         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 )
 {

-    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, 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)
-    {
-        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->Finalise();
+

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


@@ -270,7 +229,8 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
         }
     }
 
         }
     }
 

-    return box;
+    return sizer;

 }
 
 }
 

+

 #endif // wxUSE_BUTTON
 #endif // wxUSE_BUTTON