Have wxPropertyGrid inherit from wxControl and wxScrollHelper instead of wxScrolledWindow. This is the approach other scrolled controls use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-09-24 14:47:20 +00:00
parent ff94c563ed
commit 2e2e62def1
4 changed files with 95 additions and 74 deletions

View File

@@ -712,8 +712,9 @@ enum wxPG_SET_SPLITTER_POSITION_SPLITTER_FLAGS
@library{wxpropgrid}
@category{propgrid}
*/
class WXDLLIMPEXP_PROPGRID
wxPropertyGrid : public wxScrolledWindow, public wxPropertyGridInterface
class WXDLLIMPEXP_PROPGRID wxPropertyGrid : public wxControl,
public wxScrollHelper,
public wxPropertyGridInterface
{
friend class wxPropertyGridEvent;
friend class wxPropertyGridPageState;
@@ -735,7 +736,7 @@ public:
#endif
/** The default constructor. The styles to be used are styles valid for
the wxWindow and wxScrolledWindow.
the wxWindow.
@see @link wndflags Additional Window Styles @endlink
*/
@@ -1039,7 +1040,7 @@ public:
@param pt
Coordinates in the virtual grid space. You may need to use
wxScrolledWindow::CalcScrolledPosition() for translating
wxScrolled<T>::CalcScrolledPosition() for translating
wxPropertyGrid client coordinates into something this member
function can use.
*/
@@ -1838,12 +1839,7 @@ protected:
/** Current cursor id. */
int m_curcursor;
/**
This captionFont is made equal to the font of the wxScrolledWindow.
As extra the bold face is set on it when this is wanted by the user
(see flags)
*/
// Caption font. Same as normal font plus bold style.
wxFont m_captionFont;
int m_fontHeight; // Height of the font.
@@ -2110,7 +2106,7 @@ protected:
void CorrectEditorWidgetPosY();
int DoDrawItems( wxDC& dc,
const wxRect* drawRect,
const wxRect* itemsRect,
bool isBuffered ) const;
/** Draws an expand/collapse (ie. +/-) button.
@@ -2122,7 +2118,7 @@ protected:
void DrawItems( wxDC& dc,
unsigned int topItemY,
unsigned int bottomItemY,
const wxRect* drawRect = NULL );
const wxRect* itemsRect = NULL );
// Translate wxKeyEvent to wxPG_ACTION_XXX
int KeyEventToActions(wxKeyEvent &event, int* pSecond) const;