X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e163f7bb2a6a2c7b05bde6ba324f529ea99b7c76..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index 99afca1a65..6bd2ad6073 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -1,76 +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 char*) wxPanelNameStr; - -// Dialog boxes -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) - inline wxPanel(wxWindow *parent, - int x, int y, int width, int height, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr) - { - Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name); - } - - // Constructor - inline wxPanel(wxWindow *parent, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTAB_TRAVERSAL | wxNO_BORDER, - const wxString& name = wxPanelNameStr) - { - Create(parent, id, pos, size, style, name); - } - - 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(); - - // overriden base class virtuals - virtual void SetFocus(); - - // callbacks - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - // Process a keyboard navigation message (Tab traversal) - void OnNavigationKey(wxNavigationKeyEvent& event); - -protected: - bool SetFocusToNextChild(wxNode *nodeCurrent = NULL, bool bForward = TRUE); - -DECLARE_DYNAMIC_CLASS(wxPanel) -DECLARE_EVENT_TABLE() + wxPanel() { } + + // Constructor + wxPanel(wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr) + { + Create(parent, winid, pos, size, style, name); + } + +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED_CONSTRUCTOR( + wxPanel(wxWindow *parent, + int x, int y, int width, int height, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr) + { + Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); + } + ) +#endif // WXWIN_COMPATIBILITY_2_8 + +private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); }; -#endif - // __PANELH_G__ +#endif // _WX_GENERIC_PANELG_H_