X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..3d4c6a214ac5b00dbf5e314e369471135db81c0d:/include/wx/generic/panelg.h?ds=sidebyside

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 94ac38d287..99afca1a65 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -23,45 +23,52 @@ WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
 // Dialog boxes
 class WXDLLEXPORT wxPanel: public wxWindow
 {
-  DECLARE_DYNAMIC_CLASS(wxPanel)
 public:
+  wxPanel();
 
-  wxPanel(void);
-
-  // Old-style constructor
+  // Old-style constructor (no default values for coordinates to avoid ambiguity
+  // with the new one)
   inline wxPanel(wxWindow *parent,
-           int x = -1, int y= -1, int width = 500, int height = 500,
-           long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
+                 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,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-           const wxString& name = wxPanelNameStr)
+  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);
-
-  void OnPaint(wxPaintEvent& event);
+              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
+  // 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()
 };