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:
Jaakko Salli
parent
a2837c3c43
commit
ec3cce5a29
@ -18,9 +18,6 @@
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
//
|
||||
// Additional Value Type Handlers
|
||||
//
|
||||
@ -38,8 +35,6 @@ WX_PG_DECLARE_EDITOR_WITH_DECL(SpinCtrl,WXDLLIMPEXP_PROPGRID)
|
||||
WX_PG_DECLARE_EDITOR_WITH_DECL(DatePickerCtrl,WXDLLIMPEXP_PROPGRID)
|
||||
#endif
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -124,7 +119,6 @@ public:
|
||||
Init( type, colour );
|
||||
}
|
||||
|
||||
#ifndef SWIG
|
||||
void operator=(const wxColourPropertyValue& cpv)
|
||||
{
|
||||
if (this != &cpv)
|
||||
@ -133,27 +127,14 @@ public:
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxColourPropertyValue)
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
#ifndef SWIG
|
||||
bool WXDLLIMPEXP_PROPGRID
|
||||
operator==(const wxColourPropertyValue&, const wxColourPropertyValue&);
|
||||
|
||||
DECLARE_VARIANT_OBJECT_EXPORTED(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef SWIG
|
||||
#define wxPG_EMPTY_CPV (*(NULL))
|
||||
#define wxPG_NORMAL_FONT (*wxNORMAL_FONT)
|
||||
#else
|
||||
#define wxPG_EMPTY_CPV wxCPV_wxPG_EMPTY
|
||||
#define wxPG_NORMAL_FONT wxFONT_wxPG_NORMAL_FONT
|
||||
#endif
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Declare part of custom colour property macro pairs.
|
||||
|
||||
@ -163,9 +144,6 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
// Exclude class from wxPython bindings
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxFontProperty
|
||||
@ingroup classes
|
||||
Property representing wxFont.
|
||||
@ -191,8 +169,6 @@ public:
|
||||
protected:
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -304,9 +280,6 @@ private:
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
// Exclude classes from wxPython bindings
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxCursorProperty
|
||||
@ingroup classes
|
||||
Property representing wxCursor.
|
||||
@ -381,7 +354,6 @@ public:
|
||||
const wxString& name,
|
||||
const wxArrayString& strings,
|
||||
const wxArrayString& value );
|
||||
#ifndef SWIG
|
||||
wxMultiChoiceProperty( const wxString& label,
|
||||
const wxString& name,
|
||||
const wxPGChoices& choices,
|
||||
@ -390,7 +362,7 @@ public:
|
||||
wxMultiChoiceProperty( const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxArrayString& value = wxArrayString() );
|
||||
#endif
|
||||
|
||||
virtual ~wxMultiChoiceProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
@ -490,8 +462,6 @@ protected:
|
||||
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_SPINBTN
|
||||
|
||||
@ -30,7 +30,6 @@ public:
|
||||
wxWindow* m_primary;
|
||||
wxWindow* m_secondary;
|
||||
|
||||
#ifndef SWIG
|
||||
wxPGWindowList( wxWindow* a )
|
||||
{
|
||||
m_primary = a;
|
||||
@ -41,7 +40,6 @@ public:
|
||||
m_primary = a;
|
||||
m_secondary = b;
|
||||
};
|
||||
#endif
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@ -153,7 +151,6 @@ public:
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
|
||||
wxWindow* wnd_primary, wxEvent& event ) const = 0;
|
||||
|
||||
#if !defined(SWIG) || defined(CREATE_VCW)
|
||||
/** Returns value from control, via parameter 'variant'.
|
||||
Usually ends up calling property's StringToValue or IntToValue.
|
||||
Returns true if value was different.
|
||||
@ -161,7 +158,6 @@ public:
|
||||
virtual bool GetValueFromControl( wxVariant& variant,
|
||||
wxPGProperty* property,
|
||||
wxWindow* ctrl ) const;
|
||||
#endif
|
||||
|
||||
/**
|
||||
Sets new appearance for the control. Default implementation
|
||||
@ -363,9 +359,6 @@ public:
|
||||
};
|
||||
|
||||
|
||||
// Exclude classes from being able to be derived from in wxPython bindings
|
||||
#ifndef SWIG
|
||||
|
||||
class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
|
||||
{
|
||||
public:
|
||||
@ -397,8 +390,6 @@ public:
|
||||
DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor)
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
|
||||
#if wxPG_INCLUDE_CHECKBOX
|
||||
|
||||
|
||||
@ -170,8 +170,6 @@ protected:
|
||||
*/
|
||||
wxString m_label;
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
//virtual bool ProcessEvent( wxEvent& event );
|
||||
|
||||
wxPropertyGridManager* m_manager;
|
||||
@ -181,9 +179,7 @@ protected:
|
||||
private:
|
||||
bool m_isDefault; // is this base page object?
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
#endif
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@ -639,8 +635,6 @@ public:
|
||||
virtual void SetWindowStyleFlag ( long style );
|
||||
virtual bool Reparent( wxWindowBase *newParent );
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
@ -748,7 +742,6 @@ protected:
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
#endif // #ifndef SWIG
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
@ -47,9 +47,6 @@ struct wxPGPaintData
|
||||
};
|
||||
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
|
||||
// space between vertical sides of a custom image
|
||||
#define wxPG_CUSTOM_IMAGE_SPACINGY 1
|
||||
|
||||
@ -220,7 +217,6 @@ protected:
|
||||
bool m_hasValidText;
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
/**
|
||||
@class wxPGCell
|
||||
@ -317,8 +313,6 @@ private:
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxPGAttributeStorage
|
||||
|
||||
wxPGAttributeStorage is somewhat optimized storage for
|
||||
@ -366,7 +360,6 @@ protected:
|
||||
wxPGHashMapS2P m_map;
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
@ -517,8 +510,6 @@ wxPG_PROP_BEING_DELETED = 0x00200000
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/**
|
||||
@section propgrid_property_attributes wxPropertyGrid Property Attribute
|
||||
Identifiers.
|
||||
@ -703,12 +694,8 @@ wxPG_PROP_BEING_DELETED = 0x00200000
|
||||
#define wxPG_ATTR_INLINE_HELP wxPGGlobalVars->m_strInlineHelp
|
||||
#endif
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxPGChoiceEntry
|
||||
Data of a single wxPGChoices choice.
|
||||
*/
|
||||
@ -789,7 +776,6 @@ private:
|
||||
|
||||
#define wxPGChoicesEmptyData ((wxPGChoicesData*)NULL)
|
||||
|
||||
#endif // SWIG
|
||||
|
||||
/** @class wxPGChoices
|
||||
|
||||
@ -1014,14 +1000,14 @@ public:
|
||||
/** Removes count items starting at position nIndex. */
|
||||
void RemoveAt(size_t nIndex, size_t count = 1);
|
||||
|
||||
#ifndef SWIG
|
||||
/** Does not create copies for itself. */
|
||||
/** Does not create copies for itself.
|
||||
TODO: Deprecate.
|
||||
*/
|
||||
void Set( const wxChar* const* labels, const long* values = NULL )
|
||||
{
|
||||
Free();
|
||||
Add(labels,values);
|
||||
}
|
||||
#endif // SWIG
|
||||
|
||||
/** Version that works with wxArrayString and wxArrayInt. */
|
||||
void Set( const wxArrayString& labels,
|
||||
@ -1058,7 +1044,6 @@ public:
|
||||
|
||||
wxArrayString GetLabels() const;
|
||||
|
||||
#ifndef SWIG
|
||||
void operator= (const wxPGChoices& a)
|
||||
{
|
||||
if (this != &a)
|
||||
@ -1080,7 +1065,6 @@ protected:
|
||||
|
||||
void Init();
|
||||
void Free();
|
||||
#endif // !SWIG
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@ -1143,7 +1127,6 @@ public:
|
||||
*/
|
||||
virtual wxVariant DoGetValue() const { return m_value; }
|
||||
|
||||
#if !defined(SWIG) || defined(CREATE_VCW)
|
||||
/** Implement this function in derived class to check the value.
|
||||
Return true if it is ok. Returning false prevents property change events
|
||||
from occurring.
|
||||
@ -1215,7 +1198,7 @@ public:
|
||||
virtual bool IntToValue( wxVariant& value,
|
||||
int number,
|
||||
int argFlags = 0 ) const;
|
||||
#endif // !defined(SWIG) || defined(CREATE_VCW)
|
||||
|
||||
/**
|
||||
Converts property value into a text representation.
|
||||
|
||||
@ -1931,7 +1914,6 @@ public:
|
||||
*/
|
||||
void SetDefaultValue( wxVariant& value );
|
||||
|
||||
#ifndef SWIG
|
||||
/** Sets editor for a property.
|
||||
|
||||
@param editor
|
||||
@ -1946,7 +1928,6 @@ public:
|
||||
{
|
||||
m_customEditor = editor;
|
||||
}
|
||||
#endif
|
||||
|
||||
/** Sets editor for a property.
|
||||
*/
|
||||
@ -2100,7 +2081,6 @@ public:
|
||||
}
|
||||
#endif // wxUSE_VALIDATORS
|
||||
|
||||
#ifndef SWIG
|
||||
/** Returns client data (void*) of a property.
|
||||
*/
|
||||
void* GetClientData() const
|
||||
@ -2128,7 +2108,6 @@ public:
|
||||
/** Sets managed client object of a property.
|
||||
*/
|
||||
wxClientData *GetClientObject() const { return m_clientObject; }
|
||||
#endif
|
||||
|
||||
/** Sets new set of choices for property.
|
||||
|
||||
@ -2226,16 +2205,12 @@ public:
|
||||
*/
|
||||
int GetImageOffset( int imageWidth ) const;
|
||||
|
||||
#ifndef SWIG
|
||||
// Returns wxPropertyGridPageState in which this property resides.
|
||||
wxPropertyGridPageState* GetParentState() const { return m_parentState; }
|
||||
#endif
|
||||
|
||||
#ifndef SWIG
|
||||
wxPGProperty* GetItemAtY( unsigned int y,
|
||||
unsigned int lh,
|
||||
unsigned int* nextItemY ) const;
|
||||
#endif
|
||||
|
||||
/** Returns property at given virtual y coordinate.
|
||||
*/
|
||||
@ -2245,8 +2220,6 @@ public:
|
||||
*/
|
||||
wxPGProperty* GetPropertyByName( const wxString& name ) const;
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
// Returns various display-related information for given column
|
||||
void GetDisplayInfo( unsigned int column,
|
||||
int choiceIndex,
|
||||
@ -2414,7 +2387,6 @@ private:
|
||||
// Called in constructors.
|
||||
void Init();
|
||||
void Init( const wxString& label, const wxString& name );
|
||||
#endif // #ifndef SWIG
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@ -2427,14 +2399,12 @@ private:
|
||||
#define WX_PG_DECLARE_DOGETEDITORCLASS \
|
||||
virtual const wxPGEditor* DoGetEditorClass() const;
|
||||
|
||||
#ifndef SWIG
|
||||
#ifndef WX_PG_DECLARE_PROPERTY_CLASS
|
||||
#define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \
|
||||
public: \
|
||||
DECLARE_DYNAMIC_CLASS(CLASSNAME) \
|
||||
WX_PG_DECLARE_DOGETEDITORCLASS \
|
||||
private:
|
||||
#else
|
||||
#define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME)
|
||||
#endif
|
||||
|
||||
// Implements sans constructor function. Also, first arg is class name, not
|
||||
@ -2447,8 +2417,6 @@ const wxPGEditor* PROPNAME::DoGetEditorClass() const \
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/** @class wxPGRootProperty
|
||||
@ingroup classes
|
||||
Root parent property.
|
||||
@ -2511,8 +2479,6 @@ private:
|
||||
void Init();
|
||||
};
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#endif // wxUSE_PROPGRID
|
||||
|
||||
@ -34,8 +34,6 @@ class wxPGComboBox;
|
||||
// Global variables
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
// This is required for sharing common global variables.
|
||||
class WXDLLIMPEXP_PROPGRID wxPGGlobalVarsClass
|
||||
{
|
||||
@ -119,8 +117,6 @@ extern WXDLLIMPEXP_DATA_PROPGRID(wxPGGlobalVarsClass*) wxPGGlobalVars;
|
||||
// then the built-in module system won't pick this one up. Add it manually.
|
||||
WXDLLIMPEXP_PROPGRID void wxPGInitResourceModule();
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
/** @section propgrid_window_styles wxPropertyGrid Window Styles
|
||||
@ -529,8 +525,6 @@ enum wxPG_SET_SPLITTER_POSITION_SPLITTER_FLAGS
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
// Internal flags
|
||||
#define wxPG_FL_INITIALIZED 0x0001
|
||||
// Set when creating editor controls if it was clicked on.
|
||||
@ -583,9 +577,7 @@ enum wxPG_SET_SPLITTER_POSITION_SPLITTER_FLAGS
|
||||
// Prevents RecalculateVirtualSize re-entrancy
|
||||
#define wxPG_FL_RECALCULATING_VIRTUAL_SIZE 0x80000000
|
||||
|
||||
#endif // #ifndef SWIG
|
||||
|
||||
#if !defined(__wxPG_SOURCE_FILE__) && !defined(SWIG)
|
||||
#if !defined(__wxPG_SOURCE_FILE__)
|
||||
// Reduce compile time, but still include in user app
|
||||
#include "wx/propgrid/props.h"
|
||||
#endif
|
||||
@ -1007,7 +999,6 @@ public:
|
||||
*/
|
||||
virtual void RefreshProperty( wxPGProperty* p );
|
||||
|
||||
#ifndef SWIG
|
||||
/** Registers a new editor class.
|
||||
@return
|
||||
Pointer to the editor class instance that should be used.
|
||||
@ -1021,7 +1012,6 @@ public:
|
||||
static wxPGEditor* DoRegisterEditorClass( wxPGEditor* editorClass,
|
||||
const wxString& editorName,
|
||||
bool noDefCheck = false );
|
||||
#endif
|
||||
|
||||
/** Resets all colours to the original system values.
|
||||
*/
|
||||
@ -1451,8 +1441,6 @@ public:
|
||||
// Events from editor controls are forward to this function
|
||||
void HandleCustomEditorEvent( wxEvent &event );
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/**
|
||||
Generates contents for string dst based on the contents of
|
||||
wxArrayString src.
|
||||
@ -2129,7 +2117,6 @@ private:
|
||||
bool ButtonTriggerKeyTest( int action, wxKeyEvent& event );
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
#endif // #ifndef SWIG
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@ -2137,7 +2124,6 @@ private:
|
||||
// Bunch of inlines that need to resolved after all classes have been defined.
|
||||
//
|
||||
|
||||
#ifndef SWIG
|
||||
inline bool wxPropertyGridPageState::IsDisplayed() const
|
||||
{
|
||||
return ( this == m_pPropGrid->GetState() );
|
||||
@ -2147,7 +2133,6 @@ inline unsigned int wxPropertyGridPageState::GetActualVirtualHeight() const
|
||||
{
|
||||
return DoGetRoot()->GetChildrenHeight(GetGrid()->GetRowHeight());
|
||||
}
|
||||
#endif
|
||||
|
||||
inline wxString wxPGProperty::GetHintText() const
|
||||
{
|
||||
@ -2284,10 +2269,10 @@ public:
|
||||
|
||||
/** Constructor. */
|
||||
wxPropertyGridEvent(wxEventType commandType=0, int id=0);
|
||||
#ifndef SWIG
|
||||
|
||||
/** Copy constructor. */
|
||||
wxPropertyGridEvent(const wxPropertyGridEvent& event);
|
||||
#endif
|
||||
|
||||
/** Destructor. */
|
||||
~wxPropertyGridEvent();
|
||||
|
||||
@ -2397,7 +2382,6 @@ public:
|
||||
m_validationInfo->SetFailureMessage( message );
|
||||
}
|
||||
|
||||
#ifndef SWIG
|
||||
wxPGVFBFlags GetValidationFailureBehavior() const
|
||||
{
|
||||
wxASSERT( GetEventType() == wxEVT_PG_CHANGING );
|
||||
@ -2455,8 +2439,6 @@ private:
|
||||
|
||||
bool m_canVeto;
|
||||
bool m_wasVetoed;
|
||||
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -28,8 +28,6 @@
|
||||
// NOTE: More in propertygrid.cpp
|
||||
//
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
|
||||
// space between vertical line and value text
|
||||
@ -209,7 +207,6 @@
|
||||
#define wxPG_SMALL_SCREEN 0
|
||||
#endif
|
||||
|
||||
#endif // #ifndef SWIG
|
||||
|
||||
// Undefine wxPG_ICON_WIDTH to use supplied xpm bitmaps instead
|
||||
// (for tree buttons)
|
||||
@ -264,17 +261,13 @@ class wxPGValidationInfo;
|
||||
@{
|
||||
*/
|
||||
|
||||
#ifndef SWIG
|
||||
// Used to tell wxPGProperty to use label as name as well
|
||||
#define wxPG_LABEL (*wxPGProperty::sm_wxPG_LABEL)
|
||||
// This is the value placed in wxPGProperty::sm_wxPG_LABEL
|
||||
#define wxPG_LABEL_STRING wxS("@!")
|
||||
#define wxPG_NULL_BITMAP wxNullBitmap
|
||||
#define wxPG_COLOUR_BLACK (*wxBLACK)
|
||||
#else
|
||||
#define wxPG_NULL_BITMAP wxBitmap_NULL
|
||||
#define wxPG_COLOUR_BLACK wxColour_BLACK
|
||||
#endif // #ifndef SWIG
|
||||
// Used to tell wxPGProperty to use label as name as well
|
||||
#define wxPG_LABEL (*wxPGProperty::sm_wxPG_LABEL)
|
||||
|
||||
// This is the value placed in wxPGProperty::sm_wxPG_LABEL
|
||||
#define wxPG_LABEL_STRING wxS("@!")
|
||||
#define wxPG_NULL_BITMAP wxNullBitmap
|
||||
#define wxPG_COLOUR_BLACK (*wxBLACK)
|
||||
|
||||
/** Convert Red, Green and Blue to a single 32-bit value.
|
||||
*/
|
||||
@ -323,13 +316,10 @@ typedef wxString wxPGCachedString;
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxPGProperty*, wxArrayPGProperty,
|
||||
wxBaseArrayPtrVoid,
|
||||
class WXDLLIMPEXP_PROPGRID);
|
||||
|
||||
// Always use wxString based hashmap with unicode, stl, swig and GCC 4.0+
|
||||
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(void*,
|
||||
wxPGHashMapS2P,
|
||||
class WXDLLIMPEXP_PROPGRID);
|
||||
@ -349,8 +339,6 @@ WX_DECLARE_HASH_MAP_WITH_DECL(wxInt32,
|
||||
wxPGHashMapI2I,
|
||||
class WXDLLIMPEXP_PROPGRID);
|
||||
|
||||
#endif // #ifndef SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
enum wxPG_GETPROPERTYVALUES_FLAGS
|
||||
@ -442,15 +430,17 @@ enum wxPG_SETVALUE_FLAGS
|
||||
// -----------------------------------------------------------------------
|
||||
// Editor class.
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
// Editor accessor (for backwards compatiblity use only).
|
||||
#define wxPG_EDITOR(T) wxPGEditor_##T
|
||||
|
||||
// Declare editor class, with optional part.
|
||||
#define WX_PG_DECLARE_EDITOR_WITH_DECL(EDITOR,DECL) \
|
||||
extern DECL wxPGEditor* wxPGEditor_##EDITOR; \
|
||||
extern DECL wxPGEditor* wxPGConstruct##EDITOR##EditorClass();
|
||||
// Macro for declaring editor class, with optional impexpdecl part.
|
||||
#ifndef WX_PG_DECLARE_EDITOR_WITH_DECL
|
||||
|
||||
#define WX_PG_DECLARE_EDITOR_WITH_DECL(EDITOR,DECL) \
|
||||
extern DECL wxPGEditor* wxPGEditor_##EDITOR; \
|
||||
extern DECL wxPGEditor* wxPGConstruct##EDITOR##EditorClass();
|
||||
|
||||
#endif
|
||||
|
||||
// Declare editor class.
|
||||
#define WX_PG_DECLARE_EDITOR(EDITOR) \
|
||||
@ -467,8 +457,6 @@ WX_PG_DECLARE_EDITOR_WITH_DECL(CheckBox,WXDLLIMPEXP_PROPGRID)
|
||||
#endif
|
||||
WX_PG_DECLARE_EDITOR_WITH_DECL(ChoiceAndButton,WXDLLIMPEXP_PROPGRID)
|
||||
|
||||
#endif // !SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
@ -672,8 +660,6 @@ template<> inline wxVariant WXVARIANT( const wxColour& value )
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
//
|
||||
// Tokenizer macros.
|
||||
// NOTE: I have made two versions - worse ones (performance and consistency
|
||||
@ -729,8 +715,6 @@ protected:
|
||||
#define WX_PG_TOKENIZER2_END() \
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#endif // wxUSE_PROPGRID
|
||||
|
||||
@ -19,8 +19,6 @@
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
/** @section wxPGPropArgCls
|
||||
|
||||
Most property grid functions have this type as their argument, as it can
|
||||
@ -110,8 +108,6 @@ private:
|
||||
unsigned char m_flags;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
typedef const wxPGPropArgCls& wxPGPropArg;
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@ -415,14 +411,12 @@ public:
|
||||
return m_pState->GetPropertyCategory(p);
|
||||
}
|
||||
|
||||
#ifndef SWIG
|
||||
/** Returns client data (void*) of a property. */
|
||||
void* GetPropertyClientData( wxPGPropArg id ) const
|
||||
{
|
||||
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(NULL)
|
||||
return p->GetClientData();
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
Returns first property which label matches given string.
|
||||
@ -511,10 +505,8 @@ public:
|
||||
{
|
||||
return (unsigned long) GetPropertyValueAsLong(id);
|
||||
}
|
||||
#ifndef SWIG
|
||||
int GetPropertyValueAsInt( wxPGPropArg id ) const
|
||||
{ return (int)GetPropertyValueAsLong(id); }
|
||||
#endif
|
||||
bool GetPropertyValueAsBool( wxPGPropArg id ) const;
|
||||
double GetPropertyValueAsDouble( wxPGPropArg id ) const;
|
||||
|
||||
@ -573,7 +565,6 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef SWIG
|
||||
/** Returns a wxVariant list containing wxVariant versions of all
|
||||
property values. Order is not guaranteed.
|
||||
@param flags
|
||||
@ -589,7 +580,6 @@ public:
|
||||
{
|
||||
return m_pState->DoGetPropertyValues(listname, baseparent, flags);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
Returns currently selected property. NULL if none.
|
||||
@ -610,9 +600,7 @@ public:
|
||||
return m_pState->m_selection;
|
||||
}
|
||||
|
||||
#ifndef SWIG
|
||||
wxPropertyGridPageState* GetState() const { return m_pState; }
|
||||
#endif
|
||||
|
||||
/** Similar to GetIterator(), but instead returns wxPGVIterator instance,
|
||||
which can be useful for forward-iterating through arbitrary property
|
||||
@ -967,7 +955,6 @@ public:
|
||||
const wxColour& fgCol = wxNullColour,
|
||||
const wxColour& bgCol = wxNullColour );
|
||||
|
||||
#ifndef SWIG
|
||||
/** Sets client data (void*) of a property.
|
||||
@remarks
|
||||
This untyped client data has to be deleted manually.
|
||||
@ -995,7 +982,6 @@ public:
|
||||
p->SetEditor(editor);
|
||||
RefreshProperty(p);
|
||||
}
|
||||
#endif
|
||||
|
||||
/** Sets editor control of a property. As editor argument, use
|
||||
editor name string, such as "TextCtrl" or "Choice".
|
||||
@ -1056,7 +1042,6 @@ public:
|
||||
p->SetValueToUnspecified();
|
||||
}
|
||||
|
||||
#ifndef SWIG
|
||||
/**
|
||||
Sets property values from a list of wxVariants.
|
||||
*/
|
||||
@ -1077,7 +1062,6 @@ public:
|
||||
{
|
||||
SetPropertyValues(list.GetList(),defaultCategory);
|
||||
}
|
||||
#endif
|
||||
|
||||
/** Associates the help string with property.
|
||||
@remarks
|
||||
@ -1118,7 +1102,6 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef SWIG
|
||||
/** Sets value (long integer) of a property.
|
||||
*/
|
||||
void SetPropertyValue( wxPGPropArg id, long value )
|
||||
@ -1217,7 +1200,6 @@ public:
|
||||
wxVariant v = WXVARIANT(value);
|
||||
SetPropVal( id, v );
|
||||
}
|
||||
#endif // !SWIG
|
||||
|
||||
/** Sets value (wxString) of a property.
|
||||
|
||||
@ -1239,11 +1221,9 @@ public:
|
||||
SetPropVal( id, value );
|
||||
}
|
||||
|
||||
#ifndef SWIG
|
||||
/** Sets value (wxVariant&) of a property. Same as SetPropertyValue, but
|
||||
accepts reference. */
|
||||
void SetPropVal( wxPGPropArg id, wxVariant& value );
|
||||
#endif
|
||||
|
||||
/** Adjusts how wxPropertyGrid behaves when invalid value is entered
|
||||
in a property.
|
||||
@ -1332,8 +1312,6 @@ protected:
|
||||
// Default call's m_pState's BaseGetPropertyByName
|
||||
virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const;
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
// Deriving classes must set this (it must be only or current page).
|
||||
wxPropertyGridPageState* m_pState;
|
||||
|
||||
@ -1362,7 +1340,6 @@ private:
|
||||
return NULL;
|
||||
return static_cast<const wxPropertyGrid*>(m_pState->GetGrid());
|
||||
}
|
||||
#endif // #ifndef SWIG
|
||||
|
||||
friend class wxPropertyGrid;
|
||||
friend class wxPropertyGridManager;
|
||||
|
||||
@ -379,7 +379,6 @@ public:
|
||||
m_pIt = it.m_pIt;
|
||||
m_pIt->IncRef();
|
||||
}
|
||||
#ifndef SWIG
|
||||
const wxPGVIterator& operator=( const wxPGVIterator& it )
|
||||
{
|
||||
if (this != &it)
|
||||
@ -390,7 +389,6 @@ public:
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
#endif
|
||||
void Next() { m_pIt->Next(); }
|
||||
bool AtEnd() const { return m_pIt->m_it.AtEnd(); }
|
||||
wxPGProperty* GetProperty() const { return m_pIt->m_it.GetProperty(); }
|
||||
@ -400,9 +398,6 @@ protected:
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#ifndef SWIG
|
||||
// We won't need this class from wxPython
|
||||
|
||||
/** @class wxPropertyGridPageState
|
||||
|
||||
Contains low-level property page information (properties, column widths,
|
||||
@ -748,8 +743,6 @@ private:
|
||||
void InitNonCatMode();
|
||||
};
|
||||
|
||||
#endif // #ifndef SWIG
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
#endif // wxUSE_PROPGRID
|
||||
|
||||
@ -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.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user