Reverted corrupt file (may not be in line with Vadim's changes)

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

diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h
index 70247ae171f0b631d791644a3337d7264fa8e56c..64ec0d6cd19dc4e6ee01918b2c0433ccd350197e 100644 (file)
--- a/include/wx/stubs/frame.h
+++ b/include/wx/stubs/frame.h
@@ -60,8 +60,8 @@ public:
   void GetSize(int *width, int *height) const ;
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-
-  virtual bool OnClose();
+  void ClientToScreen(int *x, int *y) const;
+  void ScreenToClient(int *x, int *y) const;
 
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
@@ -126,16 +126,17 @@ public:
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 
-  virtual void Maximize(bool maximize);
+  // Is the frame maximized?
+  virtual bool IsMaximized(void) const ;
 
-  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
+  virtual void Maximize(bool maximize);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Query app for menu item updates (called from OnIdle)
   void DoMenuUpdates();
-  void DoMenuUpdates(wxMenu* menu);
+  void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
 
   // Checks if there is a toolbar, and returns the first free client position
   virtual wxPoint GetClientAreaOrigin() const;
@@ -147,7 +148,6 @@ protected:
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;
   wxToolBar *           m_frameToolBar ;
-  wxAcceleratorTable    m_acceleratorTable;
 
   DECLARE_EVENT_TABLE()
 };