X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..10a59880771fae005b31e003916a028267b54427:/src/common/dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 82501e06d9..260bb28bc8 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -114,7 +114,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
                 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
@@ -172,14 +172,9 @@ 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 *box = is_pda ? new wxBoxSizer( wxVERTICAL ) : new wxBoxSizer( wxHORIZONTAL );
         
     wxBoxSizer *inner_yes_no = NULL;
     
@@ -201,7 +196,6 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 #endif
 
     wxButton *ok = (wxButton *) NULL;
-    wxButton *cancel = (wxButton *) NULL;
     wxButton *yes = (wxButton *) NULL;
     wxButton *no = (wxButton *) NULL;
 
@@ -243,7 +237,7 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 
     if (flags & wxCANCEL)
     {
-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
+        wxButton *cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
         inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
     }