Added wx/listbase.h with wxListCtrl types, so we can

[wxWidgets.git] / include / wx / msw / frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 300931980a5020cdb999ea90e00f590f89870e0e..4b4b657d2f01ad6d01eeadf9e00b965af27b7719 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -52,7 +52,6 @@ public:
     // -------------------------------
 
     // event handlers
     // -------------------------------
 
     // event handlers

-    void OnActivate(wxActivateEvent& event);

     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Toolbar
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Toolbar


@@ -91,6 +90,7 @@ public:
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);

+    bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup);

 
     // tooltip management
 #if wxUSE_TOOLTIPS
 
     // tooltip management
 #if wxUSE_TOOLTIPS


@@ -102,10 +102,6 @@ public:
     // current size - this has an effect of refreshing the window layout
     void SendSizeEvent();
 
     // current size - this has an effect of refreshing the window layout
     void SendSizeEvent();
 

-    // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
-

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -141,14 +137,10 @@ protected:
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 

-    // the last focused child: we restore focus to it on activation
-    wxWindow             *m_winLastFocused;
-

     // Data to save/restore when calling ShowFullScreen
     int                   m_fsStatusBarFields; // 0 for no status bar
     int                   m_fsStatusBarHeight;
     int                   m_fsToolBarHeight;
     // Data to save/restore when calling ShowFullScreen
     int                   m_fsStatusBarFields; // 0 for no status bar
     int                   m_fsStatusBarHeight;
     int                   m_fsToolBarHeight;

-//    WXHMENU               m_fsMenu;

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS