X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/908d45166b3dbe175746fd8145e331e805193aba..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index a4c8029462..6bd2ad6073 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -1,85 +1,49 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: panelg.h -// Purpose: wxPanel: similar to wxWindows but is coloured as for a dialog +// Name: wx/generic/panelg.h +// Purpose: wxPanel: a container for child controls // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) -// Licence: wxWindows licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __PANELH_G__ -#define __PANELH_G__ +#ifndef _WX_GENERIC_PANELG_H_ +#define _WX_GENERIC_PANELG_H_ -#ifdef __GNUG__ -#pragma interface "panelg.h" -#endif +#include "wx/bitmap.h" -#include "wx/window.h" - -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; - - -class WXDLLEXPORT wxPanel : public wxWindow +class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase { public: - wxPanel(); - - // Old-style constructor (no default values for coordinates to avoid - // ambiguity with the new one) + wxPanel() { } + + // Constructor wxPanel(wxWindow *parent, - int x, int y, int width, int height, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr) { - Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name); + Create(parent, winid, pos, size, style, name); } - - // Constructor + +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED_CONSTRUCTOR( wxPanel(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, + int x, int y, int width, int height, long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr) { - Create(parent, id, pos, size, style, name); + Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); } - - // Pseudo ctor - bool Create(wxWindow *parent, wxWindowID id, - 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(); - - // implementation - // 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); - - // called by wxWindow whenever it gets focus - void SetLastFocus(long focus) { m_lastFocus = focus; } - long GetLastFocus() const { return m_lastFocus; } - -protected: - // the child which had the focus last time this panel was activated - long m_lastFocus; + ) +#endif // WXWIN_COMPATIBILITY_2_8 private: - DECLARE_DYNAMIC_CLASS(wxPanel) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); }; -#endif - // __PANELH_G__ +#endif // _WX_GENERIC_PANELG_H_