wxFrame::CreateToolBar() stuff

wxDC::SetBackground from Chris Breeze
zillions of compile fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/dc.h

@@ -119,6 +119,9 @@ class wxDC: public wxObject
     virtual void SetBrush( const wxBrush &brush ) = 0;
     virtual wxBrush *GetBrush(void) { return &m_brush; };
 
+    virtual void SetBackground( const wxBrush &brush ) = 0;
+    virtual wxBrush *GetBackground(void) { return &m_backgroundBrush; };
+
     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) { return m_logicalFunction; };
     

include/wx/gtk/dcclient.h

@@ -80,6 +80,7 @@ class wxPaintDC: public wxDC
     virtual void SetFont( const wxFont &font );
     virtual void SetPen( const wxPen &pen );
     virtual void SetBrush( const wxBrush &brush );
+    virtual void SetBackground( const wxBrush &brush );
     virtual void SetLogicalFunction( int function );
     virtual void SetTextForeground( const wxColour &col );
     virtual void SetTextBackground( const wxColour &col );

include/wx/gtk/dnd.h

@@ -35,7 +35,7 @@ class wxTextDragSource;
 // wxDropTarget
 //-------------------------------------------------------------------------
 
-class wxDropTarget: wxObject
+class wxDropTarget: public wxObject
 {
   public:
 

include/wx/gtk/frame.h

@@ -21,6 +21,7 @@
 #include "wx/window.h"
 #include "wx/menu.h"
 #include "wx/statusbr.h"
+#include "wx/toolbar.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -42,8 +43,9 @@ extern const char *wxFrameNameStr;
 
 class wxFrame: public wxWindow
 {
+  DECLARE_DYNAMIC_CLASS(wxFrame)
 public:
-  // construction
+
   wxFrame();
   wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
     const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -54,38 +56,35 @@ public:
   ~wxFrame();
   bool Destroy();
 
-  // operations
-    //
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
 
-    // frame size
   virtual void GetClientSize( int *width, int *height ) const;
-    // set minimal size for the frame (@@@ other params not implemented)
-  void SetSizeHints(int minW, int minH,
-                    int maxW = -1, int maxH = -1,
-                    int incW = -1);
+  
+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
 
-    // status bar
   virtual bool CreateStatusBar( int number = 1 );
-  wxStatusBar *GetStatusBar();
+  virtual wxStatusBar *GetStatusBar();
   virtual void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusWidths( int n, int *width );
 
-    // menu bar
-  void SetMenuBar( wxMenuBar *menuBar );
-  wxMenuBar *GetMenuBar();
+  virtual wxToolBar *CreateToolBar( int style = 0, 
+                                    int orientation = wxHORIZONTAL, int rowsOrColumns = 1 );
+  virtual wxToolBar *GetToolBar();
+  
+  virtual void SetMenuBar( wxMenuBar *menuBar );
+  virtual wxMenuBar *GetMenuBar();
 
-    // frame title
   void SetTitle( const wxString &title );
   wxString GetTitle() const { return m_title; }
 
-  // implementation
-  void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
+  void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
   void OnCloseWindow( wxCloseEvent& event );
   void OnIdle(wxIdleEvent& event);
 
+  virtual void AddChild( wxWindow *child );
   virtual void GtkOnSize( int x, int y, int width, int height );
 
 private:
@@ -99,10 +98,12 @@ private:
   GtkWidget    *m_mainWindow;
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
+  wxToolBar    *m_frameToolBar;
+  int           m_toolBarHeight;
   bool          m_doingOnSize;
+  bool          m_addPrivateChild;   // for toolbar (and maybe menubar)
   wxString      m_title;
 
-  DECLARE_DYNAMIC_CLASS(wxFrame)
   DECLARE_EVENT_TABLE()
 };
 

include/wx/gtk/mdi.h

@@ -68,9 +68,6 @@ class wxMDIParentFrame: public wxFrame
     void GetClientSize(int *width, int *height) const;
     wxMDIChildFrame *GetActiveChild(void) const;
     
-    virtual void SetToolBar( wxToolBar *toolbar );
-    virtual wxWindow *GetToolBar(void) const;
-  
     wxMDIClientWindow *GetClientWindow(void) const; 
     virtual wxMDIClientWindow *OnCreateClient(void);
   
@@ -95,7 +92,6 @@ class wxMDIParentFrame: public wxFrame
     wxMDIClientWindow              *m_clientWindow;
     bool                            m_parentFrameActive;
     wxMenuBar                      *m_mdiMenuBar;
-    wxToolBar                      *m_toolBar;
 
   DECLARE_EVENT_TABLE()    
 };

include/wx/gtk/tbargtk.h

@@ -112,6 +112,8 @@ class wxToolBar: public wxControl
       const wxString& helpString1 = "", const wxString& helpString2 = "");
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
+    
+    virtual void Layout(void);
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on