wxDropTarget starts to work

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 07e4e586ff482da2534fd6edbc39e600871b3e35..bfbad63e7a8563f581b1262cb97cf88325350e24 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -2,10 +2,9 @@
 // Name:        frame.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        frame.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -19,14 +18,18 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"

-#include "wx/menu.h"
-#include "wx/statusbr.h"
+#include "wx/icon.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxMDIChildFrame;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxMDIChildFrame;

+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -35,6 +38,7 @@ class wxFrame;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;

+extern const char *wxToolBarNameStr;

 
 //-----------------------------------------------------------------------------
 // wxFrame
 
 //-----------------------------------------------------------------------------
 // wxFrame


@@ -42,56 +46,85 @@ extern const char *wxFrameNameStr;
 
 class wxFrame: public wxWindow
 {
 
 class wxFrame: public wxWindow
 {

-  DECLARE_DYNAMIC_CLASS(wxFrame)
-
-  public:
-  
-    wxFrame(void);
-    wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+DECLARE_DYNAMIC_CLASS(wxFrame)
+
+public:
+    wxFrame();
+    wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
+            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );

     bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
     bool Create( wxWindow *parent, wxWindowID id, const wxString &title,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame(void);
-    bool Destroy(void);
-    void OnCloseWindow( wxCloseEvent& event );
+            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+    ~wxFrame();
+    bool Destroy();
+

     virtual bool Show( bool show );
     virtual bool Show( bool show );

-    virtual void Enable( bool enable );
+    virtual void Centre( int direction = wxHORIZONTAL );
+

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

-    void OnSize( wxSizeEvent &event );
-    void SetMenuBar( wxMenuBar *menuBar );
-    virtual bool CreateStatusBar( int number = 1 );
+
+    virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
+            const wxString& name = "statusBar");
+    virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
+            const wxString& name );
+    virtual wxStatusBar *GetStatusBar() const;
+    inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }

     virtual void SetStatusText( const wxString &text, int number = 0 );
     virtual void SetStatusText( const wxString &text, int number = 0 );

-    virtual void SetStatusWidths( int n, int *width );
-    wxStatusBar *GetStatusBar(void);
-    wxMenuBar *GetMenuBar(void);
-    void SetTitle( const wxString &title );
-    wxString GetTitle(void) const;
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
-    void OnIdle( wxIdleEvent &event );
-    
-  //private:    
+    virtual void SetStatusWidths( int n, const int widths_field[] );
+
+    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 );
+    virtual wxToolBar *GetToolBar() const;
+    inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+
+    virtual void SetMenuBar( wxMenuBar *menuBar );
+    virtual wxMenuBar *GetMenuBar() const;
+
+    virtual void SetTitle( const wxString &title );
+    virtual wxString GetTitle() const { return m_title; }
+
+    virtual void SetIcon( const wxIcon &icon );
+    virtual void Iconize( bool WXUNUSED(iconize)) { }
+    virtual bool IsIconized() const { return FALSE; }
+    bool Iconized() const { return IsIconized(); }
+    virtual void Maximize(bool WXUNUSED(maximize)) {}
+    virtual void Restore() {}
+
+    virtual void Command( int id );

     
     

+    void OnCloseWindow( wxCloseEvent& event );
+    void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
+    void OnSize( wxSizeEvent &event );
+
+    void OnMenuHighlight( wxMenuEvent& event );
+
+    // implementation
+

     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void GtkOnSize( int x, int y, int width, int height );

-    void DoMenuUpdates(void);
-    void DoMenuUpdates(wxMenu* menu);
-    
-    
-  private:
-  
-    friend        wxWindow;
-    friend        wxMDIChildFrame;
-    
+    void DoMenuUpdates();
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+    virtual void OnInternalIdle();
+

     wxMenuBar    *m_frameMenuBar;
     wxMenuBar    *m_frameMenuBar;

-    GtkWidget    *m_mainWindow;
+    wxMenuBar    *m_mdiMenuBar;

     wxStatusBar  *m_frameStatusBar;
     wxStatusBar  *m_frameStatusBar;

-    bool          m_doingOnSize;
+    wxToolBar    *m_frameToolBar;

     wxString      m_title;
     wxString      m_title;

-    
-    
-  DECLARE_EVENT_TABLE()
-    
+    wxIcon        m_icon;
+    int           m_miniEdge,m_miniTitle;
+    GtkWidget    *m_mainWidget;
+
+protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+    virtual void DoSetClientSize(int width, int height);
+
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKFRAMEH__
 };
 
 #endif // __GTKFRAMEH__