gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h
index c01336217509ba2e0d85c1f84a71aa8084b19f82..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"
 
 #include "wx/window.h"
 #include "wx/toolbar.h"

+
+#if wxUSE_ACCEL

 #include "wx/accel.h"
 #include "wx/accel.h"

+#endif

 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;


@@ -63,8 +66,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);


@@ -138,7 +139,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;