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

Don't expose internal wxPropertyGridPageState functions

Browse Source 
Functions designed for internal use shouldn't be exposed as public ones
to avoid calling them directly from the user code by mistake.
This commit is contained in:
Artur Wieczorek
2022-05-30 19:13:33 +02:00
parent 9f045b5014
commit 763f4141bc
2 changed files with 23 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/wx/propgrid/propgridpagestate.h
View File

@@ -420,8 +420,6 @@ public:
return m_selection.empty()? NULL: m_selection[0]; return m_selection.empty()? NULL: m_selection[0];
} }
void ResetColumnSizes( int setSplitterFlags );
wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const; wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const;
#if WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
@@ -436,14 +434,6 @@ public:
return m_width; return m_width;
} }
// Returns minimal width for given column so that all images and texts
// will fit entirely.
// Used by SetSplitterLeft() and DoFitColumns().
int GetColumnFitWidth(const wxDC& dc,
wxPGProperty* pwc,
unsigned int col,
bool subProps) const;
int GetColumnFullWidth(const wxDC& dc, wxPGProperty* p, unsigned int col); int GetColumnFullWidth(const wxDC& dc, wxPGProperty* p, unsigned int col);
// Returns information about arbitrary position in the grid. // Returns information about arbitrary position in the grid.
@@ -457,21 +447,6 @@ public:
bool IsInNonCatMode() const { return m_properties == m_abcArray; } bool IsInNonCatMode() const { return m_properties == m_abcArray; }
// Recalculates m_virtualHeight.
void RecalculateVirtualHeight()
{
m_virtualHeight = GetActualVirtualHeight();
}
void SetColumnCount( int colCount );
void SetSplitterLeft( bool subProps = false );
// Set virtual width for this particular page.
void SetVirtualWidth( int width );
bool PrepareAfterItemsAdded();
// Called after virtual height needs to be recalculated. // Called after virtual height needs to be recalculated.
void VirtualHeightChanged() void VirtualHeightChanged()
{ {
@@ -592,6 +567,29 @@ protected:
// Returns property by its name. // Returns property by its name.
wxPGProperty* BaseGetPropertyByName(const wxString& name) const; wxPGProperty* BaseGetPropertyByName(const wxString& name) const;
// Returns minimal width for given column so that all images and texts
// will fit entirely.
// Used by SetSplitterLeft() and DoFitColumns().
int GetColumnFitWidth(const wxDC& dc, wxPGProperty* pwc,
unsigned int col, bool subProps) const;
void SetSplitterLeft(bool subProps = false);
void SetColumnCount(int colCount);
void ResetColumnSizes(int setSplitterFlags);
bool PrepareAfterItemsAdded();
// Recalculates m_virtualHeight.
void RecalculateVirtualHeight()
{
m_virtualHeight = GetActualVirtualHeight();
}
// Set virtual width for this particular page.
void SetVirtualWidth(int width);
// If visible, then this is pointer to wxPropertyGrid. // If visible, then this is pointer to wxPropertyGrid.
// This shall *never* be NULL to indicate that this state is not visible. // This shall *never* be NULL to indicate that this state is not visible.
wxPropertyGrid* m_pPropGrid; wxPropertyGrid* m_pPropGrid;

36
interface/wx/propgrid/propgridpagestate.h
View File

@@ -397,8 +397,6 @@ public:
*/ */
wxPGProperty* GetSelection() const; wxPGProperty* GetSelection() const;
void ResetColumnSizes( int setSplitterFlags );
wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const; wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const;
/** /**
@@ -406,17 +404,6 @@ public:
*/ */
int GetVirtualWidth() const; int GetVirtualWidth() const;
/**
Returns minimal width for given column so that all images and texts
will fit entirely.
Used by SetSplitterLeft() and DoFitColumns().
*/
int GetColumnFitWidth(wxClientDC& dc,
wxPGProperty* pwc,
unsigned int col,
bool subProps) const;
int GetColumnFullWidth(wxClientDC &dc, wxPGProperty *p, unsigned int col); int GetColumnFullWidth(wxClientDC &dc, wxPGProperty *p, unsigned int col);
/** /**
@@ -436,29 +423,6 @@ public:
bool IsInNonCatMode() const; bool IsInNonCatMode() const;
/**
widthChange is non-client.
*/
void OnClientWidthChange( int newWidth,
int widthChange,
bool fromOnResize = false );
/**
Recalculates m_virtualHeight.
*/
void RecalculateVirtualHeight();
void SetColumnCount( int colCount );
void SetSplitterLeft( bool subProps = false );
/**
Set virtual width for this particular page.
*/
void SetVirtualWidth( int width );
bool PrepareAfterItemsAdded();
/** /**
Called after virtual height needs to be recalculated. Called after virtual height needs to be recalculated.
*/ */