Resolve GCC's 'type-punned pointer will break strict-aliasing rules' warning by break...

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

diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 554a2c3a29619ea6f92214b48260bea25a5762b1..eacb908f316422150ee03f4103f938d1165a3b86 100644 (file)
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -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.
 /** @class wxPGInDialogValidator
     @ingroup classes
     Creates and manages a temporary wxTextCtrl for validation purposes.


@@ -81,8 +79,6 @@ private:
     wxTextCtrl*         m_textCtrl;
 };
 
     wxTextCtrl*         m_textCtrl;
 };
 

-#endif  // SWIG
-

 
 // -----------------------------------------------------------------------
 // Property classes
 
 // -----------------------------------------------------------------------
 // Property classes


@@ -126,10 +122,9 @@ protected:
 
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 

-#ifndef SWIG

 /** Constants used with DoValidation() methods.
 */
 /** Constants used with DoValidation() methods.
 */

-enum
+enum wxPGDoValidationConstants

 {
     /** Instead of modifying the value, show an error message.
     */
 {
     /** Instead of modifying the value, show an error message.
     */


@@ -143,7 +138,6 @@ enum
     */
     wxPG_PROPERTY_VALIDATION_WRAP               = 2
 };
     */
     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.
 /** @class wxBoolProperty
     @ingroup classes
     Basic property with boolean value.


@@ -343,8 +334,6 @@ public:
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
 };
 
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
 };
 

-#endif  // !SWIG
-

 // -----------------------------------------------------------------------
 
 // If set, then selection of choices is static and should not be
 // -----------------------------------------------------------------------
 
 // 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.
 /** @class wxDirProperty
     @ingroup classes
     Like wxLongStringProperty, but the button triggers dir selector instead.


@@ -712,8 +698,6 @@ protected:
     wxString    m_dlgMessage;
 };
 
     wxString    m_dlgMessage;
 };
 

-#endif  // !SWIG
-

 // -----------------------------------------------------------------------
 
 // wxBoolProperty specific flags
 // -----------------------------------------------------------------------
 
 // wxBoolProperty specific flags


@@ -758,10 +742,8 @@ public:
                                 wxWindow* primary,
                                 const wxChar* cbt );
 
                                 wxWindow* primary,
                                 const wxChar* cbt );
 

-#ifndef SWIG

     // Creates wxArrayEditorDialog for string editing. Called in OnButtonClick.
     virtual wxArrayEditorDialog* CreateEditorDialog();
     // Creates wxArrayEditorDialog for string editing. Called in OnButtonClick.
     virtual wxArrayEditorDialog* CreateEditorDialog();

-#endif

 
 protected:
     wxString        m_display; // Cache for displayed text.
 
 protected:
     wxString        m_display; // Cache for displayed text.