Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
!wxUSE_HTML)
2. some fixes to wxGrid


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-19 12:33:25 +00:00
parent 01bc089cd2
commit 4f84c635dc
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/gridg.cpp
View File

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

5
src/generic/helpwxht.cpp
View File

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