wxListCtrl will receive EVT_CHAR() events now

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 152e8132d6301beada99182ca235a8b58568c57e..bd2a51a950a1e02c349a5a6c046b71dd1304dc0f 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -71,6 +71,7 @@ public:
   virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
     { wxWindow::SetSize(rect, sizeFlags); }
   virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
   virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
     { wxWindow::SetSize(rect, sizeFlags); }
   virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }

+  virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }

 
   void ClientToScreen(int *x, int *y) const;
   wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }
 
   void ClientToScreen(int *x, int *y) const;
   wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }


@@ -78,8 +79,6 @@ public:
   void ScreenToClient(int *x, int *y) const;
   wxPoint ScreenToClient(const wxPoint& pt) const { return wxWindow::ScreenToClient(pt); }
 
   void ScreenToClient(int *x, int *y) const;
   wxPoint ScreenToClient(const wxPoint& pt) const { return wxWindow::ScreenToClient(pt); }
 

-  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);


@@ -114,12 +113,14 @@ public:
     const wxString& name);
 
   // Create toolbar
     const wxString& name);
 
   // Create toolbar

+#if wxUSE_TOOLBAR

   virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
   // If made known to the frame, the frame will manage it automatically.
   virtual void SetToolBar(wxToolBar *toolbar) ;
   virtual wxToolBar *GetToolBar() const ;
   virtual void PositionToolBar();
   virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
   // If made known to the frame, the frame will manage it automatically.
   virtual void SetToolBar(wxToolBar *toolbar) ;
   virtual wxToolBar *GetToolBar() const ;
   virtual void PositionToolBar();

+#endif // wxUSE_TOOLBAR

 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);


@@ -188,7 +189,10 @@ protected:
   wxIcon                m_icon;
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;
   wxIcon                m_icon;
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;

+
+#if wxUSE_TOOLBAR

   wxToolBar *           m_frameToolBar ;
   wxToolBar *           m_frameToolBar ;

+#endif // wxUSE_TOOLBAR

 
   //// Motif-specific
 
 
   //// Motif-specific