#include "wx/thread.h"
#include "wx/dcclient.h"
+#include "wx/control.h"
#include "wx/scrolwin.h"
#include "wx/tooltip.h"
#include "wx/datetime.h"
wxPG_BOLD_MODIFIED = 0x00000040,
/** Using this style, the column splitters move automatically based on column
- proportions (default is equal proportion for every column). This behavior
+ proportions (default is equal proportion for every column). This behaviour
stops once the user manually moves a splitter, and returns when a
splitter is double-clicked.
*/
wxPG_EX_HELP_AS_TOOLTIPS = 0x00010000,
-/** Prevent TAB from focusing to wxButtons. This behavior was default
+/** Prevent TAB from focusing to wxButtons. This behaviour was default
in version 1.2.0 and earlier.
NOTE! Tabbing to button doesn't work yet. Problem seems to be that on wxMSW
atleast the button doesn't properly propagate key events (yes, I'm using
// -----------------------------------------------------------------------
-/** @section propgrid_vfbflags wxPropertyGrid Validation Failure Behavior Flags
+/** @section propgrid_vfbflags wxPropertyGrid Validation Failure behaviour Flags
@{
*/
{
/** Prevents user from leaving property unless value is valid. If this
- behavior flag is not used, then value change is instead cancelled.
+ behaviour flag is not used, then value change is instead cancelled.
*/
wxPG_VFB_STAY_IN_PROPERTY = 0x01,
wxPG_VFB_MARK_CELL = 0x04,
/**
- Display a text message explaining the situation.
+ Display a text message explaining the situation.
To customize the way the message is displayed, you need to
reimplement wxPropertyGrid::DoShowPropertyError() in a
- derived class. Default behavior is to display the text on
+ derived class. Default behaviour is to display the text on
the top-level frame's status bar, if present, and otherwise
using wxMessageBox.
*/
}
/**
- @return Returns failure behavior which is a combination of
+ @return Returns failure behaviour which is a combination of
@ref propgrid_vfbflags.
*/
wxPGVFBFlags GetFailureBehavior() const
return *m_pValue;
}
- /** Set validation failure behavior
+ /** Set validation failure behaviour
@param failureBehavior
Mixture of @ref propgrid_vfbflags.
*/
wxString m_failureMessage;
- /** Validation failure behavior. Use wxPG_VFB_XXX flags.
+ /** Validation failure behaviour. Use wxPG_VFB_XXX flags.
*/
wxPGVFBFlags m_failureBehavior;
enum wxPG_KEYBOARD_ACTIONS
{
wxPG_ACTION_INVALID = 0,
+
+ /** Select the next property. */
wxPG_ACTION_NEXT_PROPERTY,
+
+ /** Select the previous property. */
wxPG_ACTION_PREV_PROPERTY,
+
+ /** Expand the selected property, if it has child items. */
wxPG_ACTION_EXPAND_PROPERTY,
+
+ /** Collapse the selected property, if it has child items. */
wxPG_ACTION_COLLAPSE_PROPERTY,
+
+ /** Cancel and undo any editing done in the currently active property
+ editor.
+ */
wxPG_ACTION_CANCEL_EDIT,
- wxPG_ACTION_PRESS_BUTTON, // Causes editor button (if any) to be pressed
+
+ /** Move focus to the editor control of the currently selected
+ property.
+ */
+ wxPG_ACTION_EDIT,
+
+ /** Causes editor's button (if any) to be pressed. */
+ wxPG_ACTION_PRESS_BUTTON,
+
wxPG_ACTION_MAX
};
@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;
#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
*/
@endcode
@param action
- Which action to trigger. See @link pgactions List of list of
- wxPropertyGrid actions@endlink.
+ Which action to trigger. See @ref propgrid_keyboard_actions.
+ @param keycode
+ Which keycode triggers the action.
+ @param modifiers
+ Which key event modifiers, in addition to keycode, are needed to
+ trigger the action.
*/
void AddActionTrigger( int action, int keycode, int modifiers = 0 );
/**
Centers the splitter.
-
+
@param enableAutoResizing
If @true, automatic column resizing is enabled (only applicapple
if window style wxPG_SPLITTER_AUTO_CENTER is used).
@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.
*/
void RefreshEditor();
// Events from editor controls are forward to this function
- void HandleCustomEditorEvent( wxEvent &event );
+ bool HandleCustomEditorEvent( wxEvent &event );
// Mostly useful for page switching.
void SwitchState( wxPropertyGridPageState* pNewState );
/** Standardized double-to-string conversion.
*/
- static void DoubleToString( wxString& target,
- double value,
- int precision,
- bool removeZeroes,
- wxString* precTemplate );
+ static const wxString& DoubleToString( wxString& target,
+ double value,
+ int precision,
+ bool removeZeroes,
+ wxString* precTemplate = NULL );
/**
Call this from wxPGProperty::OnEvent() to cause property value to be
Return true if user is allowed to change to another property even
if current has invalid value.
@remarks
- To add your own validation failure behavior, override
+ To add your own validation failure behaviour, override
wxPropertyGrid::DoOnValidationFailure().
*/
bool OnValidationFailure( wxPGProperty* property,
/**
Return wxStatusBar that is used by this wxPropertyGrid. You can
reimplement this member function in derived class to override
- the default behavior of using the top-level wxFrame's status
+ the default behaviour of using the top-level wxFrame's status
bar, if any.
*/
virtual wxStatusBar* GetStatusBar();
#endif
- /** Override to customize property validation failure behavior.
+ /** Override to customize property validation failure behaviour.
@param invalidValue
Value which failed in validation.
@return
/**
Runs all validation functionality (includes sending wxEVT_PG_CHANGING).
Returns true if all tests passed. Implement in derived class to
- add additional validation behavior.
+ add additional validation behaviour.
*/
virtual bool PerformValidation( wxPGProperty* p,
wxVariant& pendingValue,
wxWindow *m_wndEditor;
wxWindow *m_wndEditor2;
-#if wxPG_DOUBLE_BUFFER
wxBitmap *m_doubleBuffer;
-#endif
/** Local time ms when control was created. */
wxLongLong m_timeCreated;
/** 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.
void CorrectEditorWidgetPosY();
int DoDrawItems( wxDC& dc,
- const wxRect* drawRect,
+ const wxRect* itemsRect,
bool isBuffered ) const;
/** Draws an expand/collapse (ie. +/-) button.
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;
unsigned int selFlags = wxPG_SEL_NOVALIDATE,
unsigned int column = 1 );
+ // This function only moves focus to the wxPropertyGrid if it already
+ // was on one of its child controls.
void SetFocusOnCanvas();
bool DoHideProperty( wxPGProperty* p, bool hide, int flags );
}
/**
- Set override validation failure behavior.
+ Set override validation failure behaviour.
Only effective if Veto was also called, and only allowed if event type
is wxEVT_PG_CHANGING.
#undef wxPG_FL_INITIALIZED
#undef wxPG_FL_ACTIVATION_BY_CLICK
#undef wxPG_SUPPORT_TOOLTIPS
- #undef wxPG_DOUBLE_BUFFER
#undef wxPG_ICON_WIDTH
#undef wxPG_USE_RENDERER_NATIVE
// Following are needed by the manager headers
projects / wxWidgets.git / blobdiff