More OS/2 stubs and caret fix

[wxWidgets.git] / include / wx / generic / panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index c60d17f393e0962c10da0a6d2bb7d5d61f4a36e7..f47c9afc4199667d95682efe0342a2d6ee58028b 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -17,14 +17,14 @@
 #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)
@@ -33,6 +33,8 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
+        Init();
+
         Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
     }
     
@@ -44,6 +46,8 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
+        Init();
+
         Create(parent, id, pos, size, style, name);
     }
 
@@ -58,7 +62,13 @@ public:
     // 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);
     
@@ -69,12 +79,18 @@ public:
     void OnFocus(wxFocusEvent& event);
 
         // called by wxWindow whenever it gets focus
-    void SetLastFocus(long focus) { m_lastFocus = focus; }
-    long 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
-    long m_lastFocus;
+    wxWindow *m_winLastFocused;
+
+    // a default button or NULL
+    wxButton *m_btnDefault;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPanel)