X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd0183ca311cddba4c90afbd040ac61a013077a4..47d67540a017101b3e46abe9ef0f55914d8de37e:/include/wx/gtk/window.h diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 36ff555db3..bd18a96e90 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -26,6 +26,7 @@ #include "wx/dc.h" #include "wx/region.h" #include "wx/dnd.h" +#include "wx/accel.h" //----------------------------------------------------------------------------- // global data @@ -60,6 +61,8 @@ extern const wxPoint wxDefaultPosition; class wxWindow: public wxEvtHandler { + DECLARE_DYNAMIC_CLASS(wxWindow) + public: wxWindow(); inline wxWindow(wxWindow *parent, wxWindowID id, @@ -77,8 +80,10 @@ public: const wxString& name = wxPanelNameStr); virtual ~wxWindow(); - virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL); - virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL); + virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName, + const wxResourceTable *table = (const wxResourceTable *) NULL); + virtual wxControl *CreateItem( const wxItemResource *childResource, + const wxResourceTable *table = (const wxResourceTable *) NULL); bool Close( bool force = FALSE ); virtual bool Destroy(); @@ -97,9 +102,8 @@ public: virtual void Centre( int direction = wxHORIZONTAL ); inline void Center(int direction = wxHORIZONTAL) { Centre(direction); } virtual void Fit(); - // set minimal/maxmimal size for the frame - virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), - int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH) ) { } + + virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 ); void OnSize( wxSizeEvent &event ); void OnIdle( wxIdleEvent& event ); @@ -132,6 +136,9 @@ public: virtual wxValidator *GetValidator(); virtual void SetValidator( const wxValidator &validator ); + virtual void SetAcceleratorTable( const wxAcceleratorTable& accel ); + virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; } + bool IsBeingDeleted(); void SetId( wxWindowID id ); @@ -139,10 +146,14 @@ public: void SetCursor( const wxCursor &cursor ); - virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = NULL ); + virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL ); virtual void Clear(); - virtual bool IsExposed( long x, long y ); - virtual bool IsExposed( long x, long y, long width, long height ); + + virtual wxRegion GetUpdateRegion() const; + virtual bool IsExposed(int x, int y) const; + virtual bool IsExposed(int x, int y, int w, int h) const; + virtual bool IsExposed(const wxPoint& pt) const; + virtual bool IsExposed(const wxRect& rect) const; virtual wxColour GetBackgroundColour() const; virtual void SetBackgroundColour( const wxColour &colour ); @@ -152,9 +163,9 @@ public: virtual int GetCharHeight(void) const; virtual int GetCharWidth(void) const; virtual void GetTextExtent( const wxString& string, int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = NULL, bool use16 = FALSE) const; + int *descent = (int *) NULL, + int *externalLeading = (int *) NULL, + const wxFont *theFont = (const wxFont *) NULL, bool use16 = FALSE) const; virtual void SetDefaultBackgroundColour( const wxColour& col ) { m_defaultBackgroundColour = col; } @@ -208,27 +219,24 @@ public: virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual wxDropTarget *GetDropTarget() const; -//private: - virtual GtkWidget* GetConnectWidget(void); - virtual bool IsOwnGtkWindow( GdkWindow *window ); - -public: virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = TRUE ); virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); virtual int GetScrollPos( int orient ) const; virtual int GetScrollThumb( int orient ) const; virtual int GetScrollRange( int orient ) const; - virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL ); + virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL ); - // return FALSE from here if the window doesn't want the focus virtual bool AcceptsFocus() const; - - // update the UI state (called from OnIdle) void UpdateWindowUI(); - -public: // cannot get private going yet + // implementation + + virtual GtkWidget* GetConnectWidget(void); + virtual bool IsOwnGtkWindow( GdkWindow *window ); + void ConnectWidget( GtkWidget *widget ); + void ConnectDnDWidget( GtkWidget *widget ); + void DisconnectDnDWidget( GtkWidget *widget ); void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name ); @@ -237,45 +245,50 @@ public: // cannot get private going yet virtual void ImplementSetSize(); virtual void ImplementSetPosition(); - wxWindow *m_parent; - wxList m_children; - int m_x,m_y; - int m_width,m_height; - int m_retCode; - wxEvtHandler *m_eventHandler; - wxValidator *m_windowValidator; - wxDropTarget *m_pDropTarget; - wxWindowID m_windowId; - wxCursor *m_cursor; - wxFont m_font; - wxColour m_backgroundColour; - wxColour m_defaultBackgroundColour; - wxColour m_foregroundColour ; - wxColour m_defaultForegroundColour; - wxRegion m_updateRegion; - long m_windowStyle; - bool m_isShown; - bool m_isEnabled; - wxString m_windowName; - - GtkWidget *m_widget; - GtkWidget *m_wxwindow; - GtkAdjustment *m_hAdjust,*m_vAdjust; - float m_oldHorizontalPos; - float m_oldVerticalPos; - bool m_needParent; - bool m_hasScrolling; - bool m_hasVMT; - bool m_sizeSet; - bool m_resizing; - -public: // Layout section - - wxLayoutConstraints * m_constraints; - wxList * m_constraintsInvolvedIn; - wxSizer * m_windowSizer; - wxWindow * m_sizerParent; - bool m_autoLayout; + wxWindow *m_parent; + wxList m_children; + int m_x,m_y; + int m_width,m_height; + int m_minWidth,m_minHeight; + int m_maxWidth,m_maxHeight; + int m_retCode; + wxEvtHandler *m_eventHandler; + wxValidator *m_windowValidator; + wxDropTarget *m_pDropTarget; + wxWindowID m_windowId; + wxCursor *m_cursor; + wxFont m_font; + wxColour m_backgroundColour; + wxColour m_defaultBackgroundColour; + wxColour m_foregroundColour ; + wxColour m_defaultForegroundColour; + wxRegion m_updateRegion; + long m_windowStyle; + bool m_isShown; + bool m_isEnabled; + wxString m_windowName; + wxAcceleratorTable m_acceleratorTable; + + GtkWidget *m_widget; + GtkWidget *m_wxwindow; + GtkAdjustment *m_hAdjust,*m_vAdjust; + float m_oldHorizontalPos; + float m_oldVerticalPos; + bool m_needParent; + bool m_hasScrolling; + bool m_isScrolling; + bool m_hasOwnStyle; + bool m_hasVMT; + bool m_sizeSet; + bool m_resizing; + +public: + + wxLayoutConstraints *m_constraints; + wxList *m_constraintsInvolvedIn; + wxSizer *m_windowSizer; + wxWindow *m_sizerParent; + bool m_autoLayout; wxLayoutConstraints *GetConstraints() const; void SetConstraints( wxLayoutConstraints *constraints ); @@ -305,7 +318,6 @@ public: // Layout section virtual void GetClientSizeConstraint(int *w, int *h) const ; virtual void GetPositionConstraint(int *x, int *y) const ; - DECLARE_DYNAMIC_CLASS(wxWindow) DECLARE_EVENT_TABLE() };