Minor corrections to wxFlexGridSizer ctor documentation.

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index d53ee1280190354a9cf33a93fa46804d42c7bcfe..b0aa66438043fd686f5c5d2fe91aedb0645db123 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -40,9 +40,9 @@
 #include "wx/statline.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"
 #include "wx/statline.h"
 #include "wx/sysopt.h"
 #include "wx/module.h"

-#include "wx/private/stattext.h"

 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"

+#include "wx/textwrapper.h"

 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"


@@ -83,7 +83,7 @@ wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const
     if ( !parent )
         return NULL;
 
     if ( !parent )
         return NULL;
 

-    extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
+    extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;

     if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
     {
         // this window is being deleted and we shouldn't create any children
     if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
     {
         // this window is being deleted and we shouldn't create any children


@@ -195,7 +195,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
     // the static messages created by CreateTextSizer() (used by wxMessageBox,
     // for example), we don't want this special meaning, so we need to quote it
     wxString text(message);
     // the static messages created by CreateTextSizer() (used by wxMessageBox,
     // for example), we don't want this special meaning, so we need to quote it
     wxString text(message);

-    text.Replace(_T("&"), _T("&&"));
+    text.Replace(wxT("&"), wxT("&&"));

 
     wxTextSizerWrapper wrapper(this);
 
 
     wxTextSizerWrapper wrapper(this);
 


@@ -465,7 +465,7 @@ void wxDialogBase::OnButton(wxCommandEvent& event)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// compatibility methods for supporting the modality API 
+// compatibility methods for supporting the modality API

 // ----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
 // ----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );


@@ -483,7 +483,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
 {
     wxCommandEvent event ( type, GetId());
     event.SetEventObject(this);
 {
     wxCommandEvent event ( type, GetId());
     event.SetEventObject(this);

-    
+

     if ( !GetEventHandler()->ProcessEvent(event) )
     {
         // the event is not propagated upwards to the parent automatically
     if ( !GetEventHandler()->ProcessEvent(event) )
     {
         // the event is not propagated upwards to the parent automatically


@@ -491,7 +491,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
         // in 9 cases of 10 the message must be processed by the dialog
         // owner and not the dialog itself
         (void)GetParent()->GetEventHandler()->ProcessEvent(event);
         // in 9 cases of 10 the message must be processed by the dialog
         // owner and not the dialog itself
         (void)GetParent()->GetEventHandler()->ProcessEvent(event);

-    }    
+    }

 }
 
 
 }