updates for DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,7 +59,7 @@ protected:
|
||||
// send a notification event, return TRUE if processed
|
||||
bool SendClickEvent();
|
||||
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -53,7 +53,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
|
||||
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
|
||||
|
@@ -70,7 +70,7 @@ protected:
|
||||
virtual wxClientData* DoGetItemClientObject( int n ) const;
|
||||
|
||||
// OS2 implementation
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
|
@@ -63,7 +63,7 @@ protected:
|
||||
// For controls like radiobuttons which are really composite
|
||||
wxList m_subControls;
|
||||
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
// create the control of the given class with the given style, returns FALSE
|
||||
// if creation failed
|
||||
|
@@ -123,7 +123,7 @@ protected:
|
||||
int m_noItems;
|
||||
int m_selected;
|
||||
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
// control items
|
||||
|
@@ -49,7 +49,7 @@ public:
|
||||
,int maxVal
|
||||
);
|
||||
|
||||
// Implementation
|
||||
// Implementation
|
||||
virtual bool OS2Command( WXUINT param
|
||||
,WXWORD id
|
||||
);
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
);
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxSpinButton)
|
||||
};
|
||||
|
@@ -71,7 +71,7 @@ protected:
|
||||
wxBitmap *bitmap;
|
||||
} m_image;
|
||||
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -58,7 +58,7 @@ class WXDLLEXPORT wxStaticBox: public wxControl
|
||||
virtual bool AcceptsFocus() const { return FALSE; }
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
@@ -56,7 +56,7 @@ class WXDLLEXPORT wxStaticText: public wxControl
|
||||
virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -146,7 +146,7 @@ protected:
|
||||
// limit is big enough)
|
||||
void AdjustSpaceLimit();
|
||||
|
||||
virtual wxSize DoGetBestSize();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
@@ -524,10 +524,6 @@ protected:
|
||||
,int nHeight
|
||||
);
|
||||
|
||||
// get the size which best suits the window: e.g., for a static text it
|
||||
// will be the width and height of the text
|
||||
virtual wxSize DoGetBestSize(void);
|
||||
|
||||
// move the window to the specified location and resize it: this is called
|
||||
// from both DoSetSize() and DoSetClientSize() and would usually just call
|
||||
// ::MoveWindow() except for composite controls which will want to arrange
|
||||
|
Reference in New Issue
Block a user