X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ada8f807758339fe6a80070fe0935d87496dbe57..4508c2b01b806be847366f0b3da0f6e65ec23cc5:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index 5d9f2a0f0a..75c666f08e 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -12,7 +12,7 @@ #ifndef _WX_GENERIC_PANEL_H_ #define _WX_GENERIC_PANEL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "panelg.h" #endif @@ -21,10 +21,11 @@ // ---------------------------------------------------------------------------- #include "wx/window.h" +#include "wx/containr.h" -class WXDLLEXPORT wxButton; +class WXDLLEXPORT wxControlContainer; -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; // ---------------------------------------------------------------------------- // wxPanel contains other controls and implements TAB traversal between them @@ -44,12 +45,12 @@ public: { Init(); - Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name); + Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); } // Constructor wxPanel(wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, @@ -57,68 +58,45 @@ public: { Init(); - Create(parent, id, pos, size, style, name); + Create(parent, winid, pos, size, style, name); } // Pseudo ctor - bool Create(wxWindow *parent, wxWindowID id, + bool Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr); - // Sends an OnInitDialog event, which in turns transfers data to - // to the dialog via validators. - virtual void InitDialog(); - - // a default button is activated when Enter is pressed - wxButton *GetDefaultItem() const { return m_btnDefault; } - void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; } + virtual ~wxPanel(); // implementation from now on // -------------------------- - // responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // process a keyboard navigation message (Tab traversal) - void OnNavigationKey(wxNavigationKeyEvent& event); - - // set the focus to the first child if we get it - void OnFocus(wxFocusEvent& event); - // calls layout for layout constraints and sizers void OnSize(wxSizeEvent& event); - // overridden to tab move focus into first focusable child - virtual void SetFocus(); + virtual void InitDialog(); - // called by wxWindow whenever it gets focus - void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } - wxWindow *GetLastFocus() const { return m_winLastFocused; } +#ifdef __WXUNIVERSAL__ + virtual bool IsCanvasWindow() const { return true; } + virtual bool ProvidesBackground() const { return true; } +#endif - virtual void RemoveChild(wxWindowBase *child); + virtual void ApplyParentThemeBackground(const wxColour& bg) + { SetBackgroundColour(bg); } + + + WX_DECLARE_CONTROL_CONTAINER(); protected: // common part of all ctors void Init(); - // set the focus to the child which had it the last time - bool SetFocusToChild(); - - // the child which had the focus last time this panel was activated - wxWindow *m_winLastFocused; - - // a default button or NULL - wxButton *m_btnDefault; - private: - DECLARE_DYNAMIC_CLASS(wxPanel) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel) DECLARE_EVENT_TABLE() }; -// this function is for wxWindows use only -extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); - #endif // _WX_GENERIC_PANEL_H_