X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index 44ea182c1c..b41701eaa5 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -5,26 +5,23 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GENERIC_PANEL_H_ #define _WX_GENERIC_PANEL_H_ -#ifdef __GNUG__ - #pragma interface "panelg.h" -#endif - // ---------------------------------------------------------------------------- // headers and forward declarations // ---------------------------------------------------------------------------- #include "wx/window.h" +#include "wx/containr.h" -class WXDLLEXPORT wxButton; +class WXDLLIMPEXP_FWD_CORE 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 +41,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,72 +54,43 @@ 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 = wxID_ANY, 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(); - -#if wxUSE_BUTTON - // a default button is activated when Enter is pressed - wxButton *GetDefaultItem() const { return m_btnDefault; } - void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; } -#endif // wxUSE_BUTTON + 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; } +#endif - virtual void RemoveChild(wxWindowBase *child); + 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(); + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); } - // the child which had the focus last time this panel was activated - wxWindow *m_winLastFocused; - -#if wxUSE_BUTTON - // a default button or NULL - wxButton *m_btnDefault; -#endif // wxUSE_BUTTON - -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_