A few tweaks and cleanups

[wxWidgets.git] / src / generic / gridctrl.cpp

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index a6f8f58b808e85e953015249cec8bc453a49bb0e..a0c35be0fcd0e6bd290ddc7f3783dbdbf3543234 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_GRID || wxUSE_NEW_GRID
+

 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"


@@ -205,16 +207,21 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

+#if wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // wxGridCellEnumEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellEnumEditor
 // ----------------------------------------------------------------------------

-// A cell editor which displays an enum number as a textual equivalent.
-// eg data in cell is 0,1,2 ... n the cell could be displayed as "John","Fred"..."Bob"
-// in the combo choice box
-//
+
+// A cell editor which displays an enum number as a textual equivalent. eg
+// data in cell is 0,1,2 ... n the cell could be displayed as
+// "John","Fred"..."Bob" in the combo choice box
+

 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
                     : wxGridCellChoiceEditor()
 {
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
                     : wxGridCellChoiceEditor()
 {

+    m_startint = -1;
+

     if (!choices.IsEmpty())
         SetParameters(choices);
 }
     if (!choices.IsEmpty())
         SetParameters(choices);
 }


@@ -271,6 +278,11 @@ bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid)
     return changed;
 }
 
     return changed;
 }
 

+#endif // wxUSE_COMBOBOX
+
+// ----------------------------------------------------------------------------
+// wxGridCellAutoWrapStringEditor
+// ----------------------------------------------------------------------------

 
 void
 wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,
 
 void
 wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,


@@ -384,3 +396,5 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
     return wxSize(width,height);
 }
 

+#endif // wxUSE_GRID
+