renamed scrolwin file - no other way to make wxGTK/Univ compile

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

src/generic/gridctrl.cpp

@@ -19,8 +19,7 @@
     #pragma hdrstop
 #endif
 
-
-#if wxUSE_GRID || wxUSE_NEW_GRID 
+#if wxUSE_GRID || wxUSE_NEW_GRID
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
@@ -208,13 +207,16 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
     }
 }
 
+#if wxUSE_COMBOBOX
+
 // ----------------------------------------------------------------------------
 // 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()
 {
@@ -276,6 +278,11 @@ bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid)
     return changed;
 }
 
+#endif // wxUSE_COMBOBOX
+
+// ----------------------------------------------------------------------------
+// wxGridCellAutoWrapStringEditor
+// ----------------------------------------------------------------------------
 
 void
 wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,
@@ -389,4 +396,5 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
-#endif
+#endif // wxUSE_GRID
+