1. misc compilation (errors, warnings) fixes (from the build logs)

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

diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h
index fcd8689e5627a941ba5bc121c8e9021aea605df7..64ec0d6cd19dc4e6ee01918b2c0433ccd350197e 100644 (file)
--- a/include/wx/stubs/frame.h
+++ b/include/wx/stubs/frame.h
@@ -63,8 +63,6 @@ public:
   void ClientToScreen(int *x, int *y) const;
   void ScreenToClient(int *x, int *y) const;
 
   void ClientToScreen(int *x, int *y) const;
   void ScreenToClient(int *x, int *y) const;
 

-  virtual bool OnClose();
-

   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
   void OnActivate(wxActivateEvent& event);
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
   void OnActivate(wxActivateEvent& event);


@@ -128,6 +126,9 @@ public:
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 

+  // Is the frame maximized?
+  virtual bool IsMaximized(void) const ;
+

   virtual void Maximize(bool maximize);
 
   // Responds to colour changes
   virtual void Maximize(bool maximize);
 
   // Responds to colour changes


@@ -135,7 +136,7 @@ public:
 
   // Query app for menu item updates (called from OnIdle)
   void DoMenuUpdates();
 
   // 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;
 
   // Checks if there is a toolbar, and returns the first free client position
   virtual wxPoint GetClientAreaOrigin() const;