Use _UNICODE instead of UNICODE in wx/msw/winundef.h.

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

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index bfc3e6cdf8a696a1933be32389e4147263f286d3..e5e40029ca5d8f337bfd8fd16d82fa28b8753bf2 100644 (file)
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -170,8 +170,6 @@ protected:
     */
     wxString                m_label;
 
     */
     wxString                m_label;
 

-#ifndef SWIG
-

     //virtual bool ProcessEvent( wxEvent& event );
 
     wxPropertyGridManager*  m_manager;
     //virtual bool ProcessEvent( wxEvent& event );
 
     wxPropertyGridManager*  m_manager;


@@ -181,9 +179,7 @@ protected:
 private:
     bool                    m_isDefault; // is this base page object?
 
 private:
     bool                    m_isDefault; // is this base page object?
 

-private:

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-#endif

 };
 
 // -----------------------------------------------------------------------
 };
 
 // -----------------------------------------------------------------------


@@ -639,8 +635,6 @@ public:
     virtual void SetWindowStyleFlag ( long style );
     virtual bool Reparent( wxWindowBase *newParent );
 
     virtual void SetWindowStyleFlag ( long style );
     virtual bool Reparent( wxWindowBase *newParent );
 

-#ifndef SWIG
-

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 


@@ -748,7 +742,6 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-#endif // #ifndef SWIG

 };
 
 // -----------------------------------------------------------------------
 };
 
 // -----------------------------------------------------------------------