X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f916a19f14ce4f8d172f81344dd2b978dd29340..60a67569bf1bbcbc4d38c86ec30bb69613ecee92:/include/wx/generic/panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index a6e983e024..c5442a15e0 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -17,15 +17,15 @@
 #endif
 
 #include "wx/window.h"
+#include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
-
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
-    wxPanel();
-    
+    wxPanel() { Init(); }
+
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
     wxPanel(wxWindow *parent,
@@ -33,9 +33,11 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
+        Init();
+
         Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
     }
-    
+
     // Constructor
     wxPanel(wxWindow *parent,
             wxWindowID id = -1,
@@ -44,6 +46,8 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
+        Init();
+
         Create(parent, id, pos, size, style, name);
     }
 
@@ -53,28 +57,42 @@ public:
                 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
+    // a default button is activated when Enter is pressed
+    wxButton *GetDefaultItem() const { return m_btnDefault; }
+    void SetDefaultItem(wxButton *btn) { m_btnDefault = btn; }
+
+    // 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);
 
+    void OnSize(wxSizeEvent& event);
+
         // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *focus) { m_lastFocus = focus; }
-    wxWindow* GetLastFocus() const { return m_lastFocus; }
+    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+    wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
 protected:
+    // common part of all ctors
+    void Init();
+
     // the child which had the focus last time this panel was activated
-    wxWindow *m_lastFocus;
+    wxWindow *m_winLastFocused;
+
+    // a default button or NULL
+    wxButton *m_btnDefault;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)