moving more things to common API between carbon and cocoa, adapting WidthDefault...

[wxWidgets.git] / include / wx / propgrid / props.h

diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index b21d743621e0359d0f2ba53d37c3e6d9171946ce..5c381150561558e992a3d2919fd070cf9dad3197 100644 (file)
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2007-03-28
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2007-03-28

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////


@@ -213,13 +213,15 @@ WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR2(CLASSNAME, \
 // Common function exit
 #define WX_PG_DOGETVALIDATOR_EXIT(VALIDATOR) \
     s_ptr = VALIDATOR; \
 // Common function exit
 #define WX_PG_DOGETVALIDATOR_EXIT(VALIDATOR) \
     s_ptr = VALIDATOR; \

-    wxPGGlobalVars->m_arrValidators.Add( (void*) VALIDATOR ); \
+    wxPGGlobalVars->m_arrValidators.push_back( VALIDATOR ); \

     return VALIDATOR;
 
 // -----------------------------------------------------------------------
 
 #ifndef SWIG
 
     return VALIDATOR;
 
 // -----------------------------------------------------------------------
 
 #ifndef SWIG
 

+#include "wx/textctrl.h"
+

 /** @class wxPGInDialogValidator
     @ingroup classes
     Creates and manages a temporary wxTextCtrl for validation purposes.
 /** @class wxPGInDialogValidator
     @ingroup classes
     Creates and manages a temporary wxTextCtrl for validation purposes.


@@ -1047,8 +1049,8 @@ wxValidator* PROPNAME::DoGetValidator () const \
 // wxArrayEditorDialog
 // -----------------------------------------------------------------------
 
 // wxArrayEditorDialog
 // -----------------------------------------------------------------------
 

-#include "wx/textctrl.h"

 #include "wx/button.h"
 #include "wx/button.h"

+#include "wx/dialog.h"

 #include "wx/listbox.h"
 
 #define wxAEDIALOG_STYLE \
 #include "wx/listbox.h"
 
 #define wxAEDIALOG_STYLE \