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

Added wxWindow::Center

Browse Source 
Corrected the signature for wxWindow::SetSizeHints


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1998-08-17 18:24:32 +00:00
parent ee7ee4698c
commit cd0183ca31
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/gtk/window.h
View File

@ -76,10 +76,10 @@ public:
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
virtual ~wxWindow(); virtual ~wxWindow();
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL); virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL); virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
bool Close( bool force = FALSE ); bool Close( bool force = FALSE );
virtual bool Destroy(); virtual bool Destroy();
virtual bool DestroyChildren(); virtual bool DestroyChildren();
@ -95,10 +95,11 @@ public:
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
virtual void GetPosition( int *x, int *y ) const; virtual void GetPosition( int *x, int *y ) const;
virtual void Centre( int direction = wxHORIZONTAL ); virtual void Centre( int direction = wxHORIZONTAL );
inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
virtual void Fit(); virtual void Fit();
// set minimal/maxmimal size for the frame // set minimal/maxmimal size for the frame
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
int WXUNUSED(maxH), int WXUNUSED(incW) ) { } int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH) ) { }
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
void OnIdle( wxIdleEvent& event ); void OnIdle( wxIdleEvent& event );
@ -116,11 +117,11 @@ public:
virtual void RemoveChild( wxWindow *child ); virtual void RemoveChild( wxWindow *child );
void SetReturnCode( int retCode ); void SetReturnCode( int retCode );
int GetReturnCode(); int GetReturnCode();
wxWindow *GetParent() const wxWindow *GetParent() const
{ return m_parent; } { return m_parent; }
wxWindow *GetGrandParent(void) const wxWindow *GetGrandParent(void) const
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); } { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void SetParent( wxWindow *p ) void SetParent( wxWindow *p )
{ m_parent = p; } { m_parent = p; }
wxEvtHandler *GetEventHandler(); wxEvtHandler *GetEventHandler();
@ -147,7 +148,7 @@ public:
virtual void SetBackgroundColour( const wxColour &colour ); virtual void SetBackgroundColour( const wxColour &colour );
virtual wxColour GetForegroundColour() const; virtual wxColour GetForegroundColour() const;
virtual void SetForegroundColour( const wxColour &colour ); virtual void SetForegroundColour( const wxColour &colour );
virtual int GetCharHeight(void) const; virtual int GetCharHeight(void) const;
virtual int GetCharWidth(void) const; virtual int GetCharWidth(void) const;
virtual void GetTextExtent( const wxString& string, int *x, int *y, virtual void GetTextExtent( const wxString& string, int *x, int *y,
@ -201,16 +202,16 @@ public:
virtual bool TransferDataFromWindow(); virtual bool TransferDataFromWindow();
void OnInitDialog( wxInitDialogEvent &event ); void OnInitDialog( wxInitDialogEvent &event );
virtual void InitDialog(); virtual void InitDialog();
virtual bool PopupMenu( wxMenu *menu, int x, int y ); virtual bool PopupMenu( wxMenu *menu, int x, int y );
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const; virtual wxDropTarget *GetDropTarget() const;
//private: //private:
virtual GtkWidget* GetConnectWidget(void); virtual GtkWidget* GetConnectWidget(void);
virtual bool IsOwnGtkWindow( GdkWindow *window ); virtual bool IsOwnGtkWindow( GdkWindow *window );
public: public:
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = TRUE ); int range, bool refresh = TRUE );
@ -226,7 +227,7 @@ public:
// update the UI state (called from OnIdle) // update the UI state (called from OnIdle)
void UpdateWindowUI(); void UpdateWindowUI();
public: // cannot get private going yet public: // cannot get private going yet
void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,

23
include/wx/gtk1/window.h
View File

@ -76,10 +76,10 @@ public:
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
virtual ~wxWindow(); virtual ~wxWindow();
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL); virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL); virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
bool Close( bool force = FALSE ); bool Close( bool force = FALSE );
virtual bool Destroy(); virtual bool Destroy();
virtual bool DestroyChildren(); virtual bool DestroyChildren();
@ -95,10 +95,11 @@ public:
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
virtual void GetPosition( int *x, int *y ) const; virtual void GetPosition( int *x, int *y ) const;
virtual void Centre( int direction = wxHORIZONTAL ); virtual void Centre( int direction = wxHORIZONTAL );
inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
virtual void Fit(); virtual void Fit();
// set minimal/maxmimal size for the frame // set minimal/maxmimal size for the frame
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
int WXUNUSED(maxH), int WXUNUSED(incW) ) { } int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH) ) { }
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
void OnIdle( wxIdleEvent& event ); void OnIdle( wxIdleEvent& event );
@ -116,11 +117,11 @@ public:
virtual void RemoveChild( wxWindow *child ); virtual void RemoveChild( wxWindow *child );
void SetReturnCode( int retCode ); void SetReturnCode( int retCode );
int GetReturnCode(); int GetReturnCode();
wxWindow *GetParent() const wxWindow *GetParent() const
{ return m_parent; } { return m_parent; }
wxWindow *GetGrandParent(void) const wxWindow *GetGrandParent(void) const
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); } { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void SetParent( wxWindow *p ) void SetParent( wxWindow *p )
{ m_parent = p; } { m_parent = p; }
wxEvtHandler *GetEventHandler(); wxEvtHandler *GetEventHandler();
@ -147,7 +148,7 @@ public:
virtual void SetBackgroundColour( const wxColour &colour ); virtual void SetBackgroundColour( const wxColour &colour );
virtual wxColour GetForegroundColour() const; virtual wxColour GetForegroundColour() const;
virtual void SetForegroundColour( const wxColour &colour ); virtual void SetForegroundColour( const wxColour &colour );
virtual int GetCharHeight(void) const; virtual int GetCharHeight(void) const;
virtual int GetCharWidth(void) const; virtual int GetCharWidth(void) const;
virtual void GetTextExtent( const wxString& string, int *x, int *y, virtual void GetTextExtent( const wxString& string, int *x, int *y,
@ -201,16 +202,16 @@ public:
virtual bool TransferDataFromWindow(); virtual bool TransferDataFromWindow();
void OnInitDialog( wxInitDialogEvent &event ); void OnInitDialog( wxInitDialogEvent &event );
virtual void InitDialog(); virtual void InitDialog();
virtual bool PopupMenu( wxMenu *menu, int x, int y ); virtual bool PopupMenu( wxMenu *menu, int x, int y );
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const; virtual wxDropTarget *GetDropTarget() const;
//private: //private:
virtual GtkWidget* GetConnectWidget(void); virtual GtkWidget* GetConnectWidget(void);
virtual bool IsOwnGtkWindow( GdkWindow *window ); virtual bool IsOwnGtkWindow( GdkWindow *window );
public: public:
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = TRUE ); int range, bool refresh = TRUE );
@ -226,7 +227,7 @@ public:
// update the UI state (called from OnIdle) // update the UI state (called from OnIdle)
void UpdateWindowUI(); void UpdateWindowUI();
public: // cannot get private going yet public: // cannot get private going yet
void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,