fixed compile errors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 5601ed1c2ab6760ab786ef008e5a626206363538..132921af938e837a97f156ffe0af2b1026d1f4b2 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -605,13 +605,6 @@ public:
         Merged
     };
 
         Merged
     };
 

-    enum wxAttrOverflowMode
-    {
-        Unset = -1,
-        Overflow,
-        SingleCell
-    };
-

     // ctors
     wxGridCellAttr(wxGridCellAttr *attrDefault = NULL)
     {
     // ctors
     wxGridCellAttr(wxGridCellAttr *attrDefault = NULL)
     {


@@ -675,7 +668,7 @@ public:
     bool HasRenderer() const { return m_renderer != NULL; }
     bool HasEditor() const { return m_editor != NULL; }
     bool HasReadWriteMode() const { return m_isReadOnly != Unset; }
     bool HasRenderer() const { return m_renderer != NULL; }
     bool HasEditor() const { return m_editor != NULL; }
     bool HasReadWriteMode() const { return m_isReadOnly != Unset; }

-    bool HasOverflowMode() const { return m_overflow != Unset; }
+    bool HasOverflowMode() const { return m_overflow != UnsetOverflow; }

 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;
 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;


@@ -683,7 +676,7 @@ public:
     void GetAlignment(int *hAlign, int *vAlign) const;
     void GetSize(int *num_rows, int *num_cols) const;
     bool GetOverflow() const
     void GetAlignment(int *hAlign, int *vAlign) const;
     void GetSize(int *num_rows, int *num_cols) const;
     bool GetOverflow() const

-        { return m_overflow != wxGridCellAttr::SingleCell; }
+        { return m_overflow != SingleCell; }

     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
 
     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
 


@@ -701,6 +694,13 @@ private:
         ReadOnly
     };
 
         ReadOnly
     };
 

+    enum wxAttrOverflowMode
+    {
+        UnsetOverflow = -1,
+        Overflow,
+        SingleCell
+    };
+

     // the common part of all ctors
     void Init(wxGridCellAttr *attrDefault = NULL);
 
     // the common part of all ctors
     void Init(wxGridCellAttr *attrDefault = NULL);
 

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 3e6e14ff1de26494559911328e7da48ea2a7fa94..eb8e46ad65f3adfe688f15adc62d29a26d0d8bc8 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2061,7 +2061,7 @@ void wxGridCellAttr::Init(wxGridCellAttr *attrDefault)
     m_attrkind = wxGridCellAttr::Cell;
 
     m_sizeRows = m_sizeCols = 1;
     m_attrkind = wxGridCellAttr::Cell;
 
     m_sizeRows = m_sizeCols = 1;

-    m_overflow = TRUE;
+    m_overflow = UnsetOverflow;

 
     SetDefAttr(attrDefault);
 }
 
     SetDefAttr(attrDefault);
 }