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/grid.cpp

@@ -518,6 +518,8 @@ void wxGridCellEditor::StartingClick()
 {
 }
 
+#if wxUSE_TEXTCTRL
+
 // ----------------------------------------------------------------------------
 // wxGridCellTextEditor
 // ----------------------------------------------------------------------------
@@ -1144,6 +1146,10 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
     return FALSE;
 }
 
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+
 // ----------------------------------------------------------------------------
 // wxGridCellBoolEditor
 // ----------------------------------------------------------------------------
@@ -1288,6 +1294,10 @@ bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
     return FALSE;
 }
 
+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+
 // ----------------------------------------------------------------------------
 // wxGridCellChoiceEditor
 // ----------------------------------------------------------------------------
@@ -1408,6 +1418,8 @@ void wxGridCellChoiceEditor::SetParameters(const wxString& params)
     }
 }
 
+#endif // wxUSE_COMBOBOX
+
 // ----------------------------------------------------------------------------
 // wxGridCellEditorEvtHandler
 // ----------------------------------------------------------------------------
@@ -2456,19 +2468,24 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName)
     {
         // check whether this is one of the standard ones, in which case
         // register it "on the fly"
+#if wxUSE_TEXTCTRL
         if ( typeName == wxGRID_VALUE_STRING )
         {
             RegisterDataType(wxGRID_VALUE_STRING,
                              new wxGridCellStringRenderer,
                              new wxGridCellTextEditor);
-        }
+        } else
-        else if ( typeName == wxGRID_VALUE_BOOL )
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_CHECKBOX
+        if ( typeName == wxGRID_VALUE_BOOL )
         {
             RegisterDataType(wxGRID_VALUE_BOOL,
                              new wxGridCellBoolRenderer,
                              new wxGridCellBoolEditor);
-        }
+        } else
-        else if ( typeName == wxGRID_VALUE_NUMBER )
+#endif // wxUSE_CHECKBOX
+#if wxUSE_TEXTCTRL
+        if ( typeName == wxGRID_VALUE_NUMBER )
         {
             RegisterDataType(wxGRID_VALUE_NUMBER,
                              new wxGridCellNumberRenderer,
@@ -2479,14 +2496,16 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName)
             RegisterDataType(wxGRID_VALUE_FLOAT,
                              new wxGridCellFloatRenderer,
                              new wxGridCellFloatEditor);
-        }
+        } else
-        else if ( typeName == wxGRID_VALUE_CHOICE )
+#endif // wxUSE_TEXTCTRL
+#if wxUSE_COMBOBOX
+        if ( typeName == wxGRID_VALUE_CHOICE )
         {
             RegisterDataType(wxGRID_VALUE_CHOICE,
                              new wxGridCellStringRenderer,
                              new wxGridCellChoiceEditor);
-        }
+        } else
-        else
+#endif // wxUSE_COMBOBOX
         {
             return wxNOT_FOUND;
         }

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"
+// A cell editor which displays an enum number as a textual equivalent. eg
-// in the combo choice box
+// 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
+

src/generic/helpwxht.cpp

@@ -19,7 +19,7 @@
 #   pragma hdrstop
 #endif
 
-#if wxUSE_HTML && wxUSE_STREAMS
+#if wxUSE_WXHTML_HELP
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
@@ -315,4 +315,5 @@ wxHelpControllerHtml::GetFrameParameters(wxSize *size,
    return m_Frame;
 }
 
-#endif // wxUSE_HTML
+#endif // wxUSE_WXHTML_HELP
+

src/generic/listctrl.cpp

@@ -3142,7 +3142,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
     // FIXME
-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
@@ -3898,7 +3898,11 @@ wxColour wxListCtrl::GetForegroundColour() const
 
 bool wxListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 {
+#if wxUSE_MENUS
     return m_mainWin->PopupMenu( menu, x, y );
+#else
+    return FALSE;
+#endif // wxUSE_MENUS
 }
 
 void wxListCtrl::SetFocus()

src/generic/logg.cpp

@@ -459,6 +459,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
             wxHSCROLL       |
             wxTE_READONLY);
 
+#if wxUSE_MENUS
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;
@@ -470,6 +471,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);
+#endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts

src/generic/scrlwing.cpp

@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "scrolwin.h"
+    #pragma implementation "genscrolwin.h"
 #endif
 
 #ifdef __VMS
@@ -32,6 +32,8 @@
     #pragma hdrstop
 #endif
 
+#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
+
 #include "wx/utils.h"
 #include "wx/dcclient.h"
 
@@ -1011,3 +1013,5 @@ void wxGenericScrolledWindow::CalcUnscrolledPosition(int x, int y, float *xx, fl
 }
 #endif // WXWIN_COMPATIBILITY
 
+#endif // !wxGTK
+