1. compilation fix for wxHelpHtmlController (which shouldn't be compiled #if

!wxUSE_HTML)
2. some fixes to wxGrid


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

src/generic/gridg.cpp

@@ -98,7 +98,7 @@ wxGenericGrid::wxGenericGrid()
   m_currentRectVisible = FALSE;
   m_editable = TRUE;
 
-  m_editInPlace = TRUE;
+  m_editInPlace = FALSE;
   m_inOnTextInPlace = FALSE;
 
 #if defined(__WIN95__)
@@ -165,6 +165,8 @@ bool wxGenericGrid::Create(wxWindow *parent,
   m_textItem = (wxTextCtrl *) NULL;
   m_currentRectVisible = FALSE;
   m_editable = TRUE;
+  m_editInPlace = FALSE;
+  m_inOnTextInPlace = FALSE;
 #if defined(__WIN95__)
   m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
 #elif defined(__WXGTK__)
@@ -250,7 +252,8 @@ bool wxGenericGrid::Create(wxWindow *parent,
                                       wxPoint( m_currentRect.x-2, m_currentRect.y-2 ),
                                       wxSize( m_currentRect.width+4, m_currentRect.height+4 ),
                                       wxNO_BORDER | wxTE_PROCESS_ENTER );
-  m_inPlaceTextItem->Show(TRUE);
+  m_inPlaceTextItem->Show(m_editInPlace);
+  if ( m_editInPlace )
     m_inPlaceTextItem->SetFocus();
 
   return TRUE;

src/generic/helpwxht.cpp

@@ -19,8 +19,9 @@
 #   pragma hdrstop
 #endif
 
+#if wxUSE_HTML
+
 #ifndef WX_PRECOMP
-#   include "wx/setup.h"
 #   include "wx/string.h"
 #   include "wx/utils.h"
 #   include "wx/list.h"
@@ -185,3 +186,5 @@ wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
    if(pos) *pos = m_FramePosition;
    if(newframe) *newframe = m_NewFrameEachTime;
 }
+
+#endif // wxUSE_HTML