Integrated fixes for sizing/positioning; cleanup; removal of handle/window

association in dtor. (All according to patch #1396667).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-01-06 23:43:45 +00:00
parent 179db36df4
commit a4ebf7ba61
2 changed files with 44 additions and 240 deletions

View File

@@ -126,22 +126,12 @@ public:
virtual int GetCount(void) const;
inline int GetNumberOfRowsOrCols(void) const { return m_nNoRowsOrCols; }
void GetPosition( int* pnX
,int* pnY
) const;
inline WXHWND* GetRadioButtons(void) const { return m_ahRadioButtons; }
int GetSelection(void) const;
void GetSize( int* pnX
,int* pnY
) const;
inline int GetSizeFlags(void) const { return m_nSizeFlags; }
void AdjustButtons( int nX
,int nY
,int nWidth
,int nHeight
,int nSizeFlags
);
wxString GetString(int nIndex) const;
virtual wxString GetStringSelection(void) const;
@@ -149,7 +139,6 @@ public:
void SetFocus(void);
virtual bool SetFont(const wxFont& rFont);
inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
inline void SetNumberOfRowsOrCols(int nNum) { m_nNoRowsOrCols = nNum; }
void SetSelection(int nIndex);
virtual void SetString( int nNum
,const wxString& rsLabel
@@ -182,7 +171,6 @@ protected:
int* m_pnRadioWidth; // for bitmaps
int* m_pnRadioHeight;
int m_nNoItems;
int m_nNoRowsOrCols;
int m_nSelectedButton;
int m_nSizeFlags;