name change to correctly reflect the autorelease nature of the methods, removing...

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

diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index d35105a365f68eb1a3cec8d85609b1678de00d89..e953f7a7fe21418adf1f4e977db7aeb61794b724 100644 (file)
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -30,7 +30,6 @@ public:
     wxWindow*   m_primary;
     wxWindow*   m_secondary;
 
     wxWindow*   m_primary;
     wxWindow*   m_secondary;
 

-#ifndef SWIG

     wxPGWindowList( wxWindow* a )
     {
         m_primary = a;
     wxPGWindowList( wxWindow* a )
     {
         m_primary = a;


@@ -41,7 +40,6 @@ public:
         m_primary = a;
         m_secondary = b;
     };
         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;
 
     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.
     /** 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;
     virtual bool GetValueFromControl( wxVariant& variant,
                                       wxPGProperty* property,
                                       wxWindow* ctrl ) const;

-#endif

 
     /**
         Sets new appearance for the control. Default implementation
 
     /**
         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:
 class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
 {
 public:


@@ -397,8 +390,6 @@ public:
     DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor)
 };
 

-#endif  // !SWIG
-

 
 #if wxPG_INCLUDE_CHECKBOX
 
 
 #if wxPG_INCLUDE_CHECKBOX