Removed most of the propgrid '#ifndef SWIG' pre-compiler conditions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,8 +52,6 @@ WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME, T, EDITOR)
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxPGInDialogValidator
|
||||
@ingroup classes
|
||||
Creates and manages a temporary wxTextCtrl for validation purposes.
|
||||
@@ -81,8 +79,6 @@ private:
|
||||
wxTextCtrl* m_textCtrl;
|
||||
};
|
||||
|
||||
#endif // SWIG
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Property classes
|
||||
@@ -126,10 +122,9 @@ protected:
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
/** Constants used with DoValidation() methods.
|
||||
*/
|
||||
enum
|
||||
enum wxPGDoValidationConstants
|
||||
{
|
||||
/** Instead of modifying the value, show an error message.
|
||||
*/
|
||||
@@ -143,7 +138,6 @@ enum
|
||||
*/
|
||||
wxPG_PROPERTY_VALIDATION_WRAP = 2
|
||||
};
|
||||
#endif
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
@@ -314,9 +308,6 @@ protected:
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
// Exclude class from wxPython bindings
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxBoolProperty
|
||||
@ingroup classes
|
||||
Basic property with boolean value.
|
||||
@@ -343,8 +334,6 @@ public:
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
// If set, then selection of choices is static and should not be
|
||||
@@ -684,9 +673,6 @@ protected:
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
|
||||
// Exclude class from wxPython bindings
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxDirProperty
|
||||
@ingroup classes
|
||||
Like wxLongStringProperty, but the button triggers dir selector instead.
|
||||
@@ -712,8 +698,6 @@ protected:
|
||||
wxString m_dlgMessage;
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
// wxBoolProperty specific flags
|
||||
@@ -758,10 +742,8 @@ public:
|
||||
wxWindow* primary,
|
||||
const wxChar* cbt );
|
||||
|
||||
#ifndef SWIG
|
||||
// Creates wxArrayEditorDialog for string editing. Called in OnButtonClick.
|
||||
virtual wxArrayEditorDialog* CreateEditorDialog();
|
||||
#endif
|
||||
|
||||
protected:
|
||||
wxString m_display; // Cache for displayed text.
|
||||
|
Reference in New Issue
Block a user