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 0614b627baa36a5fa2e04588ddcdc63957e7be21..bd2a51a950a1e02c349a5a6c046b71dd1304dc0f 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -54,16 +54,30 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();

+

   void SetClientSize(int width, int height);
   void SetClientSize(int width, int height);

+  void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
+

   void GetClientSize(int *width, int *height) const;
   void GetClientSize(int *width, int *height) const;

+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }

 
   void GetSize(int *width, int *height) const ;
 
   void GetSize(int *width, int *height) const ;

+  wxSize GetSize() const { return wxWindow::GetSize(); }
+

   void GetPosition(int *x, int *y) const ;
   void GetPosition(int *x, int *y) const ;

+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+

   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  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;
   void ClientToScreen(int *x, int *y) const;

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

 
 

-  virtual bool OnClose();
+  void ScreenToClient(int *x, int *y) const;
+  wxPoint ScreenToClient(const wxPoint& pt) const { return wxWindow::ScreenToClient(pt); }

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


@@ -99,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);


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

+  // Is the frame maximized? Returns FALSE under Motif (but TRUE for
+  // wxMDIChildFrame due to the tabbed implementation).
+  virtual bool IsMaximized(void) const ;
+

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


@@ -169,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