Fixed Unicode breakage

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 8b6e4f619ce8d22cdbba442ec836003cc795b33b..3aa20ce30aeb187f97a8ef20bc256f595dacbc1f 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -53,11 +53,6 @@ END_EVENT_TABLE()
 WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
 #endif
 
 WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
 #endif
 

-wxDialogBase::wxDialogBase()
-{
-    Init();
-}
-

 void wxDialogBase::Init()
 {
     m_returnCode = 0;
 void wxDialogBase::Init()
 {
     m_returnCode = 0;


@@ -201,7 +196,6 @@ 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;
 


@@ -243,7 +237,7 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 
     if (flags & wxCANCEL)
     {
 
     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 );
     }
 
         inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
     }