mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-24 07:24:31 +08:00
Lots more fixes for incorrect or missing interfaces items.
This commit is contained in:
Robin Dunn
@@ -0,0 +1,33 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/aui/floatpane.h
|
||||
// Purpose: wxaui: wx advanced user interface - docking window manager
|
||||
// Author: Benjamin I. Williams
|
||||
// Modified by:
|
||||
// Created: 2005-05-17
|
||||
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
|
||||
// Licence: wxWindows Library Licence, Version 3.1
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
class wxAuiFloatingFrame : public wxFrame
|
||||
{
|
||||
public:
|
||||
wxAuiFloatingFrame(wxWindow* parent,
|
||||
wxAuiManager* ownerMgr,
|
||||
const wxAuiPaneInfo& pane,
|
||||
wxWindowID id = wxID_ANY,
|
||||
long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
|
||||
wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT |
|
||||
wxCLIP_CHILDREN
|
||||
);
|
||||
virtual ~wxAuiFloatingFrame();
|
||||
void SetPaneWindow(const wxAuiPaneInfo& pane);
|
||||
wxAuiManager* GetOwnerManager() const;
|
||||
|
||||
protected:
|
||||
virtual void OnMoveStart();
|
||||
virtual void OnMoving(const wxRect& windowRect, wxDirection dir);
|
||||
virtual void OnMoveFinished();
|
||||
};
|
||||
|
||||
|
||||
+26
-4
@@ -3667,11 +3667,32 @@ class wxDataViewEvent : public wxNotifyEvent
|
||||
{
|
||||
public:
|
||||
/**
|
||||
Constructor. Typically used by wxWidgets internals only.
|
||||
Default ctor, normally shouldn't be used and mostly exists only for
|
||||
backwards compatibility.
|
||||
*/
|
||||
wxDataViewEvent(wxEventType commandType = wxEVT_NULL,
|
||||
int winid = 0);
|
||||
wxDataViewEvent();
|
||||
|
||||
/**
|
||||
Constructor for the events affecting columns (and possibly also items).
|
||||
*/
|
||||
wxDataViewEvent(wxEventType evtType,
|
||||
wxDataViewCtrl* dvc,
|
||||
wxDataViewColumn* column,
|
||||
const wxDataViewItem& item = wxDataViewItem());
|
||||
|
||||
/**
|
||||
Constructor for the events affecting only the items.
|
||||
*/
|
||||
wxDataViewEvent(wxEventType evtType,
|
||||
wxDataViewCtrl* dvc,
|
||||
const wxDataViewItem& item);
|
||||
|
||||
/**
|
||||
Copy constructor.
|
||||
*/
|
||||
wxDataViewEvent(const wxDataViewEvent& event);
|
||||
|
||||
|
||||
/**
|
||||
Returns the position of the column in the control or -1
|
||||
if no column field was set by the event emitter.
|
||||
@@ -3808,7 +3829,6 @@ public:
|
||||
int GetCacheTo() const;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
Returns the item affected by the event.
|
||||
|
||||
@@ -3817,6 +3837,7 @@ public:
|
||||
indicating that the drop is about to happen outside of the item area.
|
||||
*/
|
||||
wxDataViewItem GetItem() const;
|
||||
|
||||
void SetItem( const wxDataViewItem &item );
|
||||
void SetPosition( int x, int y );
|
||||
void SetCache(int from, int to);
|
||||
@@ -3826,6 +3847,7 @@ public:
|
||||
void SetDataBuffer( void* buf );
|
||||
int GetDragFlags() const;
|
||||
void SetDropEffect( wxDragResult effect );
|
||||
void SetEditCancelled();
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -3721,7 +3721,7 @@ public:
|
||||
|
||||
@since 3.1.1
|
||||
*/
|
||||
class wxPanGestureEvent : class wxGestureEvent
|
||||
class wxPanGestureEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
/**
|
||||
@@ -3773,7 +3773,7 @@ public:
|
||||
/**
|
||||
Sets the zoom Factor.
|
||||
*/
|
||||
double SetZoomFactor() const;
|
||||
void SetZoomFactor(double zoomFactor);
|
||||
};
|
||||
|
||||
|
||||
@@ -4930,6 +4930,7 @@ wxEventType wxEVT_SET_FOCUS;
|
||||
wxEventType wxEVT_KILL_FOCUS;
|
||||
wxEventType wxEVT_CHILD_FOCUS;
|
||||
wxEventType wxEVT_MOUSEWHEEL;
|
||||
wxEventType wxEVT_MAGNIFY;
|
||||
wxEventType wxEVT_AUX1_DOWN;
|
||||
wxEventType wxEVT_AUX1_UP;
|
||||
wxEventType wxEVT_AUX1_DCLICK;
|
||||
@@ -4963,6 +4964,12 @@ wxEventType wxEVT_SCROLLWIN_PAGEUP;
|
||||
wxEventType wxEVT_SCROLLWIN_PAGEDOWN;
|
||||
wxEventType wxEVT_SCROLLWIN_THUMBTRACK;
|
||||
wxEventType wxEVT_SCROLLWIN_THUMBRELEASE;
|
||||
wxEventType wxEVT_GESTURE_PAN;
|
||||
wxEventType wxEVT_GESTURE_ZOOM;
|
||||
wxEventType wxEVT_GESTURE_ROTATE;
|
||||
wxEventType wxEVT_TWO_FINGER_TAP;
|
||||
wxEventType wxEVT_LONG_PRESS;
|
||||
wxEventType wxEVT_PRESS_AND_TAP;
|
||||
wxEventType wxEVT_SIZE;
|
||||
wxEventType wxEVT_MOVE;
|
||||
wxEventType wxEVT_CLOSE_WINDOW;
|
||||
|
||||
@@ -1573,8 +1573,6 @@ public:
|
||||
|
||||
wxGraphicsPenInfo& Style(wxPenStyle style);
|
||||
|
||||
wxGraphicsPenInfo& Style(wxPenStyle style);
|
||||
|
||||
wxGraphicsPenInfo& Stipple(const wxBitmap& stipple);
|
||||
|
||||
wxGraphicsPenInfo& Dashes(int nb_dashes, const wxDash *dash);
|
||||
|
||||
+4
-4
@@ -84,8 +84,8 @@ public:
|
||||
|
||||
@since 3.1.0
|
||||
*/
|
||||
virtual wxSize GetBestHeight(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
|
||||
int row, int col, int width);
|
||||
virtual int GetBestHeight(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
|
||||
int row, int col, int width);
|
||||
|
||||
/**
|
||||
Get the preferred width of the cell at the given height.
|
||||
@@ -94,8 +94,8 @@ public:
|
||||
|
||||
@since 3.1.0
|
||||
*/
|
||||
virtual wxSize GetBestWidth(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
|
||||
int row, int col, int height);
|
||||
virtual int GetBestWidth(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
|
||||
int row, int col, int height);
|
||||
|
||||
protected:
|
||||
/**
|
||||
|
||||
@@ -130,8 +130,6 @@ public:
|
||||
|
||||
wxPenInfo& Style(wxPenStyle style);
|
||||
|
||||
wxPenInfo& Style(wxPenStyle style);
|
||||
|
||||
wxPenInfo& Stipple(const wxBitmap& stipple);
|
||||
|
||||
wxPenInfo& Dashes(int nb_dashes, const wxDash *dash);
|
||||
|
||||
@@ -0,0 +1,351 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: advprops.h
|
||||
// Purpose: interfaces of wxPropertyGrid Advanced Properties (font,
|
||||
// colour, etc.)
|
||||
// Author: wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
|
||||
// Web colour is currently unsupported
|
||||
#define wxPG_COLOUR_WEB_BASE 0x10000
|
||||
|
||||
|
||||
#define wxPG_COLOUR_CUSTOM 0xFFFFFF
|
||||
#define wxPG_COLOUR_UNSPECIFIED (wxPG_COLOUR_CUSTOM+1)
|
||||
|
||||
/** @class wxColourPropertyValue
|
||||
|
||||
Because text, background and other colours tend to differ between
|
||||
platforms, wxSystemColourProperty must be able to select between system
|
||||
colour and, when necessary, to pick a custom one. wxSystemColourProperty
|
||||
value makes this possible.
|
||||
*/
|
||||
class wxColourPropertyValue : public wxObject
|
||||
{
|
||||
public:
|
||||
/** An integer value relating to the colour, and which exact
|
||||
meaning depends on the property with which it is used.
|
||||
|
||||
For wxSystemColourProperty:
|
||||
|
||||
Any of wxSYS_COLOUR_XXX, or any web-colour ( use wxPG_TO_WEB_COLOUR
|
||||
macro - (currently unsupported) ), or wxPG_COLOUR_CUSTOM.
|
||||
|
||||
For custom colour properties without values array specified:
|
||||
|
||||
index or wxPG_COLOUR_CUSTOM
|
||||
|
||||
For custom colour properties <b>with</b> values array specified:
|
||||
|
||||
m_arrValues[index] or wxPG_COLOUR_CUSTOM
|
||||
*/
|
||||
wxUint32 m_type;
|
||||
|
||||
/** Resulting colour. Should be correct regardless of type. */
|
||||
wxColour m_colour;
|
||||
|
||||
wxColourPropertyValue();
|
||||
wxColourPropertyValue( const wxColourPropertyValue& v );
|
||||
wxColourPropertyValue( const wxColour& colour );
|
||||
wxColourPropertyValue( wxUint32 type );
|
||||
wxColourPropertyValue( wxUint32 type, const wxColour& colour );
|
||||
|
||||
virtual ~wxColourPropertyValue();
|
||||
|
||||
void Init( wxUint32 type, const wxColour& colour );
|
||||
|
||||
void operator=(const wxColourPropertyValue& cpv);
|
||||
};
|
||||
|
||||
|
||||
|
||||
/** @class wxFontProperty
|
||||
@ingroup classes
|
||||
Property representing wxFont.
|
||||
*/
|
||||
class wxFontProperty : public wxPGProperty
|
||||
{
|
||||
public:
|
||||
|
||||
wxFontProperty(const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxFont& value = wxFont());
|
||||
virtual ~wxFontProperty();
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
virtual wxVariant ChildChanged( wxVariant& thisValue,
|
||||
int childIndex,
|
||||
wxVariant& childValue ) const;
|
||||
virtual void RefreshChildren();
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
/** If set, then match from list is searched for a custom colour. */
|
||||
#define wxPG_PROP_TRANSLATE_CUSTOM wxPG_PROP_CLASS_SPECIFIC_1
|
||||
|
||||
|
||||
/** @class wxSystemColourProperty
|
||||
@ingroup classes
|
||||
Has dropdown list of wxWidgets system colours. Value used is
|
||||
of wxColourPropertyValue type.
|
||||
*/
|
||||
class wxSystemColourProperty : public wxEnumProperty
|
||||
{
|
||||
public:
|
||||
|
||||
wxSystemColourProperty( const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxColourPropertyValue&
|
||||
value = wxColourPropertyValue() );
|
||||
virtual ~wxSystemColourProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual bool IntToValue(wxVariant& variant,
|
||||
int number,
|
||||
int argFlags = 0) const;
|
||||
|
||||
/**
|
||||
Override in derived class to customize how colours are printed as
|
||||
strings.
|
||||
*/
|
||||
virtual wxString ColourToString( const wxColour& col, int index,
|
||||
int argFlags = 0 ) const;
|
||||
|
||||
/** Returns index of entry that triggers colour picker dialog
|
||||
(default is last).
|
||||
*/
|
||||
virtual int GetCustomColourIndex() const;
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual bool StringToValue( wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0 ) const;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
virtual wxSize OnMeasureImage( int item ) const;
|
||||
virtual void OnCustomPaint( wxDC& dc,
|
||||
const wxRect& rect, wxPGPaintData& paintdata );
|
||||
|
||||
// Helper function to show the colour dialog
|
||||
bool QueryColourFromUser( wxVariant& variant ) const;
|
||||
|
||||
/** Default is to use wxSystemSettings::GetColour(index). Override to use
|
||||
custom colour tables etc.
|
||||
*/
|
||||
virtual wxColour GetColour( int index ) const;
|
||||
|
||||
wxColourPropertyValue GetVal( const wxVariant* pVariant = NULL ) const;
|
||||
|
||||
protected:
|
||||
|
||||
// Special constructors to be used by derived classes.
|
||||
wxSystemColourProperty( const wxString& label, const wxString& name,
|
||||
const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
|
||||
const wxColourPropertyValue& value );
|
||||
|
||||
wxSystemColourProperty( const wxString& label, const wxString& name,
|
||||
const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
|
||||
const wxColour& value );
|
||||
|
||||
void Init( int type, const wxColour& colour );
|
||||
|
||||
// Utility functions for internal use
|
||||
virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
|
||||
wxVariant TranslateVal( wxColourPropertyValue& v ) const;
|
||||
wxVariant TranslateVal( int type, const wxColour& colour ) const;
|
||||
|
||||
// Translates colour to a int value, return wxNOT_FOUND if no match.
|
||||
int ColToInd( const wxColour& colour ) const;
|
||||
};
|
||||
|
||||
|
||||
|
||||
class wxColourProperty : public wxSystemColourProperty
|
||||
{
|
||||
public:
|
||||
wxColourProperty( const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxColour& value = *wxWHITE );
|
||||
virtual ~wxColourProperty();
|
||||
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual wxColour GetColour( int index ) const;
|
||||
|
||||
protected:
|
||||
virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
|
||||
};
|
||||
|
||||
|
||||
|
||||
/** @class wxCursorProperty
|
||||
@ingroup classes
|
||||
Property representing wxCursor.
|
||||
*/
|
||||
class wxCursorProperty : public wxEnumProperty
|
||||
{
|
||||
public:
|
||||
wxCursorProperty( const wxString& label= wxPG_LABEL,
|
||||
const wxString& name= wxPG_LABEL,
|
||||
int value = 0 );
|
||||
virtual ~wxCursorProperty();
|
||||
|
||||
virtual wxSize OnMeasureImage( int item ) const;
|
||||
virtual void OnCustomPaint( wxDC& dc,
|
||||
const wxRect& rect, wxPGPaintData& paintdata );
|
||||
};
|
||||
|
||||
|
||||
const wxString& wxPGGetDefaultImageWildcard();
|
||||
|
||||
/** @class wxImageFileProperty
|
||||
@ingroup classes
|
||||
Property representing image file(name).
|
||||
*/
|
||||
class wxImageFileProperty : public wxFileProperty
|
||||
{
|
||||
public:
|
||||
|
||||
wxImageFileProperty( const wxString& label= wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxString& value = wxEmptyString);
|
||||
virtual ~wxImageFileProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
|
||||
virtual wxSize OnMeasureImage( int item ) const;
|
||||
virtual void OnCustomPaint( wxDC& dc,
|
||||
const wxRect& rect, wxPGPaintData& paintdata );
|
||||
|
||||
protected:
|
||||
wxBitmap* m_pBitmap; // final thumbnail area
|
||||
wxImage* m_pImage; // intermediate thumbnail area
|
||||
};
|
||||
|
||||
|
||||
|
||||
/** @class wxMultiChoiceProperty
|
||||
@ingroup classes
|
||||
Property that manages a value resulting from wxMultiChoiceDialog. Value is
|
||||
array of strings. You can get value as array of choice values/indices by
|
||||
calling wxMultiChoiceProperty::GetValueAsArrayInt().
|
||||
|
||||
<b>Supported special attributes:</b>
|
||||
- "UserStringMode": If > 0, allow user to manually enter strings that are
|
||||
not in the list of choices. If this value is 1, user strings are
|
||||
preferably placed in front of valid choices. If value is 2, then those
|
||||
strings will placed behind valid choices.
|
||||
*/
|
||||
class wxMultiChoiceProperty : public wxPGProperty
|
||||
{
|
||||
public:
|
||||
|
||||
wxMultiChoiceProperty( const wxString& label,
|
||||
const wxString& name,
|
||||
const wxArrayString& strings,
|
||||
const wxArrayString& value );
|
||||
wxMultiChoiceProperty( const wxString& label,
|
||||
const wxString& name,
|
||||
const wxPGChoices& choices,
|
||||
const wxArrayString& value = wxArrayString() );
|
||||
|
||||
wxMultiChoiceProperty( const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxArrayString& value = wxArrayString() );
|
||||
|
||||
virtual ~wxMultiChoiceProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual bool StringToValue(wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0) const;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid,
|
||||
wxWindow* primary, wxEvent& event );
|
||||
|
||||
wxArrayInt GetValueAsArrayInt() const;
|
||||
|
||||
protected:
|
||||
|
||||
void GenerateValueAsString( wxVariant& value, wxString* target ) const;
|
||||
|
||||
// Returns translation of values into string indices.
|
||||
wxArrayInt GetValueAsIndices() const;
|
||||
|
||||
wxArrayString m_valueAsStrings; // Value as array of strings
|
||||
|
||||
// Cache displayed text since generating it is relatively complicated.
|
||||
wxString m_display;
|
||||
};
|
||||
|
||||
|
||||
|
||||
/** @class wxDateProperty
|
||||
@ingroup classes
|
||||
Property representing wxDateTime.
|
||||
|
||||
<b>Supported special attributes:</b>
|
||||
- "DateFormat": Determines displayed date format.
|
||||
- "PickerStyle": Determines window style used with wxDatePickerCtrl.
|
||||
Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE
|
||||
enables additional support for unspecified property value.
|
||||
*/
|
||||
class wxDateProperty : public wxPGProperty
|
||||
{
|
||||
public:
|
||||
|
||||
wxDateProperty( const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxDateTime& value = wxDateTime() );
|
||||
virtual ~wxDateProperty();
|
||||
|
||||
virtual void OnSetValue();
|
||||
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
|
||||
virtual bool StringToValue(wxVariant& variant,
|
||||
const wxString& text,
|
||||
int argFlags = 0) const;
|
||||
|
||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||
|
||||
void SetFormat( const wxString& format );
|
||||
const wxString& GetFormat() const;
|
||||
|
||||
void SetDateValue( const wxDateTime& dt );
|
||||
wxDateTime GetDateValue() const;
|
||||
|
||||
long GetDatePickerStyle() const;
|
||||
|
||||
protected:
|
||||
wxString m_format;
|
||||
long m_dpStyle; // DatePicker style
|
||||
|
||||
static wxString ms_defaultDateFormat;
|
||||
static wxString DetermineDefaultDateFormat( bool showCentury );
|
||||
};
|
||||
|
||||
|
||||
|
||||
class wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
|
||||
{
|
||||
public:
|
||||
virtual ~wxPGSpinCtrlEditor();
|
||||
|
||||
wxString GetName() const;
|
||||
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
|
||||
wxPGProperty* property,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size) const;
|
||||
virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
|
||||
wxWindow* wnd, wxEvent& event ) const;
|
||||
};
|
||||
|
||||
|
||||
extern wxPGEditor* wxPGEditor_SpinCtrl;
|
||||
extern wxPGEditor* wxPGEditor_DatePickerCtrl;
|
||||
@@ -578,35 +578,9 @@ public:
|
||||
wxSize GetPrimarySize() const;
|
||||
};
|
||||
|
||||
/** @class wxPGEditorDialogAdapter
|
||||
|
||||
Derive a class from this to adapt an existing editor dialog or function to
|
||||
be used when editor button of a property is pushed.
|
||||
|
||||
You only need to derive class and implement DoShowDialog() to create and
|
||||
show the dialog, and finally submit the value returned by the dialog
|
||||
via SetValue().
|
||||
|
||||
@library{wxpropgrid}
|
||||
@category{propgrid}
|
||||
*/
|
||||
class wxPGEditorDialogAdapter : public wxObject
|
||||
{
|
||||
public:
|
||||
wxPGEditorDialogAdapter();
|
||||
|
||||
virtual ~wxPGEditorDialogAdapter();
|
||||
|
||||
bool ShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property );
|
||||
|
||||
virtual bool DoShowDialog( wxPropertyGrid* propGrid,
|
||||
wxPGProperty* property ) = 0;
|
||||
|
||||
void SetValue( wxVariant value );
|
||||
|
||||
/**
|
||||
This method is typically only used if deriving class from existing
|
||||
adapter with value conversion purposes.
|
||||
*/
|
||||
wxVariant& GetValue();
|
||||
};
|
||||
extern wxPGEditor* wxPGEditor_TextCtrl;
|
||||
extern wxPGEditor* wxPGEditor_Choice;
|
||||
extern wxPGEditor* wxPGEditor_ComboBox;
|
||||
extern wxPGEditor* wxPGEditor_TextCtrlAndButton;
|
||||
extern wxPGEditor* wxPGEditor_CheckBox;
|
||||
extern wxPGEditor* wxPGEditor_ChoiceAndButton;
|
||||
|
||||
@@ -2190,7 +2190,7 @@ public:
|
||||
|
||||
/** Paints property category selection rectangle.
|
||||
*/
|
||||
virtual void DrawCaptionSelectionRect(wxWindow *win, wxDC& dc,
|
||||
virtual void DrawCaptionSelectionRect(wxDC& dc,
|
||||
int x, int y, int w, int h) const;
|
||||
|
||||
/** Utility to draw vertically centered text.
|
||||
@@ -2706,28 +2706,6 @@ protected:
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
/** @class wxPGChoiceEntry
|
||||
|
||||
Data of a single wxPGChoices choice.
|
||||
*/
|
||||
class wxPGChoiceEntry : public wxPGCell
|
||||
{
|
||||
public:
|
||||
wxPGChoiceEntry();
|
||||
wxPGChoiceEntry(const wxPGChoiceEntry& other);
|
||||
wxPGChoiceEntry( const wxString& label,
|
||||
int value = wxPG_INVALID_VALUE );
|
||||
|
||||
virtual ~wxPGChoiceEntry();
|
||||
|
||||
void SetValue( int value );
|
||||
int GetValue() const;
|
||||
|
||||
wxPGChoiceEntry& operator=( const wxPGChoiceEntry& other );
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
/** @class wxPGRootProperty
|
||||
|
||||
Root parent property.
|
||||
|
||||
@@ -225,7 +225,14 @@ public:
|
||||
class wxPropertyGridIterator : public wxPropertyGridIteratorBase
|
||||
{
|
||||
public:
|
||||
};
|
||||
wxPropertyGridIterator();
|
||||
wxPropertyGridIterator( wxPropertyGridPageState* state,
|
||||
int flags = wxPG_ITERATE_DEFAULT,
|
||||
wxPGProperty* property = NULL, int dir = 1 );
|
||||
wxPropertyGridIterator( wxPropertyGridPageState* state,
|
||||
int flags, int startPos, int dir = 0 );
|
||||
wxPropertyGridIterator( const wxPropertyGridIterator& it );
|
||||
~wxPropertyGridIterator();};
|
||||
|
||||
/**
|
||||
Const version of wxPropertyGridIterator.
|
||||
@@ -242,6 +249,15 @@ public:
|
||||
Additional assignment operator.
|
||||
*/
|
||||
const wxPropertyGridConstIterator& operator=( const wxPropertyGridIterator& it );
|
||||
|
||||
wxPropertyGridConstIterator();
|
||||
wxPropertyGridConstIterator( const wxPropertyGridPageState* state,
|
||||
int flags = wxPG_ITERATE_DEFAULT,
|
||||
const wxPGProperty* property = NULL, int dir = 1 );
|
||||
wxPropertyGridConstIterator( wxPropertyGridPageState* state,
|
||||
int flags, int startPos, int dir = 0 );
|
||||
wxPropertyGridConstIterator( const wxPropertyGridConstIterator& it );
|
||||
~wxPropertyGridConstIterator();
|
||||
};
|
||||
|
||||
/** @}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4886,7 +4886,7 @@ public:
|
||||
/**
|
||||
Do the loading and scaling
|
||||
*/
|
||||
virtual bool LoadAndScaleImageCache(wxImage& image, const wxSize& sz, bool delayLoading, bool& changed);
|
||||
virtual bool LoadAndScaleImageCache(wxImage& image, const wxSize& sz, wxRichTextDrawingContext& context, bool& changed);
|
||||
|
||||
/**
|
||||
Gets the image state.
|
||||
|
||||
@@ -106,6 +106,7 @@ public:
|
||||
bool IsStretchableSpace() const;
|
||||
int GetStyle() const;
|
||||
wxItemKind GetKind() const;
|
||||
void MakeStretchable();
|
||||
|
||||
bool IsEnabled() const;
|
||||
bool IsToggled() const;
|
||||
@@ -122,9 +123,21 @@ public:
|
||||
|
||||
wxObject *GetClientData() const;
|
||||
|
||||
virtual bool Enable(bool enable);
|
||||
virtual bool Toggle(bool toggle);
|
||||
virtual bool SetToggle(bool toggle);
|
||||
virtual bool SetShortHelp(const wxString& help);
|
||||
virtual bool SetLongHelp(const wxString& help);
|
||||
void Toggle();
|
||||
virtual void SetNormalBitmap(const wxBitmap& bmp);
|
||||
virtual void SetDisabledBitmap(const wxBitmap& bmp);
|
||||
virtual void SetLabel(const wxString& label);
|
||||
void SetClientData(wxObject *clientData);
|
||||
|
||||
virtual void Detach();
|
||||
virtual void Attach(wxToolBarBase *tbar);
|
||||
|
||||
virtual void SetDropdownMenu(wxMenu *menu);
|
||||
wxMenu *GetDropdownMenu() const;
|
||||
};
|
||||
|
||||
|
||||
@@ -1044,7 +1044,7 @@ public:
|
||||
static wxPoint FromDIP(const wxPoint& pt, const wxWindow* w);
|
||||
|
||||
/// @overload
|
||||
static wxSize FromDIP(int d, const wxWindow* w);
|
||||
static int FromDIP(int d, const wxWindow* w);
|
||||
|
||||
|
||||
/**
|
||||
@@ -1111,7 +1111,7 @@ public:
|
||||
static wxPoint ToDIP(const wxPoint& pt, const wxWindow* w);
|
||||
|
||||
/// @overload
|
||||
static wxSize ToDIP(int d, const wxWindow* w);
|
||||
static int ToDIP(int d, const wxWindow* w);
|
||||
|
||||
/**
|
||||
This functions returns the best acceptable minimal size for the window.
|
||||
|
||||
Reference in New Issue
Block a user