removed some rests of my tests (which should have never been checked in in the

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index cb9baa3d64081d7f67767db7a69aae5fc85dc419..394e658f5909a3d30722c457e6455bb9e69197d3 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -92,6 +92,7 @@ public:
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }

+  inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }

   virtual void PositionStatusBar(void);
   virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name);
   virtual void PositionStatusBar(void);
   virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name);


@@ -129,8 +130,6 @@ public:
   virtual void Maximize(bool maximize);
 //  virtual bool LoadAccelerators(const wxString& table);
 
   virtual void Maximize(bool maximize);
 //  virtual bool LoadAccelerators(const wxString& table);
 

-  virtual void SetAcceleratorTable(const wxAcceleratorTable& accel);
-

   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 


@@ -166,7 +165,6 @@ protected:
   WXHICON               m_defaultIcon;
   static bool           m_useNativeStatusBar;
   wxToolBar *           m_frameToolBar ;
   WXHICON               m_defaultIcon;
   static bool           m_useNativeStatusBar;
   wxToolBar *           m_frameToolBar ;

-  wxAcceleratorTable    m_acceleratorTable;

 
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };