X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..c606a9a4010b859981b99e4699b61f63f9ba037d:/include/wx/generic/panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 89b117992c..ef7ec0b3c6 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -20,49 +20,56 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 
-// Dialog boxes
-class WXDLLEXPORT wxPanel: public wxWindow
+
+class WXDLLEXPORT wxPanel : public wxWindow
 {
-  DECLARE_DYNAMIC_CLASS(wxPanel)
 public:
+  wxPanel();
 
-  wxPanel(void);
-
-  // Old-style constructor
-  inline wxPanel(wxWindow *parent,
-           const int x = -1, const int y= -1, const int width = 500, const int height = 500,
-           const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
+  // Old-style constructor (no default values for coordinates to avoid ambiguity
+  // with the new one)
+  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, const wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
+  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, const wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr);
-
-  void OnPaint(wxPaintEvent& event);
+  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(void);
+  virtual void InitDialog();
 
-  // Responds to colour changes
+    // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
+  
+    // Process a keyboard navigation message (Tab traversal)
+  void OnNavigationKey(wxNavigationKeyEvent& event);
+
+  // override base class virtuals
+    // we don't want focus for ourselves
+  virtual bool AcceptsFocus() const { return FALSE; }
 
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif