build fix for latest C++ standard

[wxWidgets.git] / contrib / include / wx / gizmos / multicell.h

diff --git a/contrib/include/wx/gizmos/multicell.h b/contrib/include/wx/gizmos/multicell.h
index 9fc9b5b691fe95575271f4a76a6f4407453aa9dd..534e6a4d154af1c8dcf04e84e72ac7481ea7d740 100644 (file)
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -15,10 +15,6 @@
 #ifndef __WX_MULTICELL_H__
 #define __WX_MULTICELL_H__
 
 #ifndef __WX_MULTICELL_H__
 #define __WX_MULTICELL_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "multicell.h"
-#endif
-

 #include "wx/gizmos/gizmos.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/gizmos/gizmos.h"
 
 // ----------------------------------------------------------------------------


@@ -49,7 +45,7 @@ enum wxResizable
 
 class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject
 {
 
 class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject
 {

-    DECLARE_CLASS(wxMultiCellItemHandle);
+    DECLARE_CLASS(wxMultiCellItemHandle)

 protected:
     int             m_column;
     int             m_row;
 protected:
     int             m_column;
     int             m_row;


@@ -64,7 +60,6 @@ public:
     wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
     wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
     wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
     wxMultiCellItemHandle( int row, int column, int height = 1, int width = 1, wxSize size = wxDefaultSize, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
     wxMultiCellItemHandle( int row, int column, wxSize size, wxResizable style = wxNOT_RESIZABLE, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);
     wxMultiCellItemHandle( int row, int column, wxResizable style, wxSize weight = wxSize(1,1), int align = wxALIGN_NOT);

-    wxMultiCellItemHandle( int row, int column, int align);

     int             GetColumn();
     int             GetRow();
     int             GetWidth();
     int             GetColumn();
     int             GetRow();
     int             GetWidth();


@@ -85,7 +80,7 @@ private:
 
 class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer
 {
 
 class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer
 {

-    DECLARE_CLASS(wxMultiCellSizer);
+    DECLARE_CLASS(wxMultiCellSizer)

 
 protected:
     wxSize m_cell_count;
 
 protected:
     wxSize m_cell_count;


@@ -118,7 +113,7 @@ private:
     int m_maxWeights;
     wxSize m_defaultCellSize;
     wxWindow *m_win; // usually used for debugging
     int m_maxWeights;
     wxSize m_defaultCellSize;
     wxWindow *m_win; // usually used for debugging

-    wxPen *m_pen;
+    const wxPen *m_pen;

 
     void DrawGridLines(wxDC& dc);
     void Initialize(wxSize size);
 
     void DrawGridLines(wxDC& dc);
     void Initialize(wxSize size);