better-looking icons

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 4c9372f4d91224c24f9ca837dcbc8f93a8432966..1e932f95f3f4711ec1e63ca0f89491cbc355d389 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_


@@ -19,6 +19,7 @@
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"

+#include "wx/icon.h"

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


@@ -55,14 +56,6 @@ public:
 
     virtual bool Destroy();
 
 
     virtual bool Destroy();
 

-    void GetClientSize(int *width, int *height) const;
-    void GetSize(int *width, int *height) const ;
-    void GetPosition(int *x, int *y) const ;
-
-    wxSize GetSize() const { return wxWindow::GetSize(); }
-    wxPoint GetPosition() const { return wxWindow::GetPosition(); }
-    wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
-

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


@@ -85,6 +78,8 @@ public:
     void SetTitle(const wxString& title);
     wxString GetTitle() const { return m_title; }
 
     void SetTitle(const wxString& title);
     wxString GetTitle() const { return m_title; }
 

+    virtual bool IsTopLevel() const { return TRUE; }
+    

     void Centre(int direction = wxBOTH);
 
     // Call this to simulate a menu command
     void Centre(int direction = wxBOTH);
 
     // Call this to simulate a menu command


@@ -145,7 +140,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;


@@ -173,6 +168,11 @@ public:
 
     bool PreResize();
 
 
     bool PreResize();
 

+protected:
+    void DoGetClientSize(int *width, int *height) const;
+    void DoGetSize(int *width, int *height) const ;
+    void DoGetPosition(int *x, int *y) const ;
+

 protected:
     wxMenuBar *           m_frameMenuBar;
     wxStatusBar *         m_frameStatusBar;
 protected:
     wxMenuBar *           m_frameMenuBar;
     wxStatusBar *         m_frameStatusBar;