changed choice to properly inherit from wxChoiceBase , added msg compatible calls...

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

diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h
index 70247ae171f0b631d791644a3337d7264fa8e56c..540caf249e41cd0fd4d5a1948985d1a71fd706b0 100644 (file)
--- a/include/wx/stubs/frame.h
+++ b/include/wx/stubs/frame.h
@@ -18,7 +18,10 @@
 
 #include "wx/window.h"
 #include "wx/toolbar.h"
+
+#if wxUSE_ACCEL
 #include "wx/accel.h"
+#endif
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
@@ -60,8 +63,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 +129,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 +151,6 @@ protected:
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;
   wxToolBar *           m_frameToolBar ;
-  wxAcceleratorTable    m_acceleratorTable;
 
   DECLARE_EVENT_TABLE()
 };