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 ffde79e48ec009de2ae34a64574c529281086194..f47c9afc4199667d95682efe0342a2d6ee58028b 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -17,10 +17,10 @@
 #endif
 
 #include "wx/window.h"
+#include "wx/button.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
-
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
@@ -46,6 +46,8 @@ public:
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
+        Init();
+
         Create(parent, id, pos, size, style, name);
     }
 
@@ -77,15 +79,15 @@ 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;