See last changelog

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

include/wx/gtk/bitmap.h

@@ -32,6 +32,7 @@ class wxToolBar;
 class wxBitmapButton;
 class wxStaticBitmap;
 class wxFrame;
+class wxDialog;
 class wxTreeCtrl;
 
 class wxMask;
@@ -62,6 +63,7 @@ class wxMask: public wxObject
     friend wxBitmapButton;
     friend wxStaticBitmap;
     friend wxFrame;
+    friend wxDialog;
     friend wxTreeCtrl;
 
     GdkBitmap *GetBitmap() const;
@@ -124,6 +126,7 @@ class wxBitmap: public wxObject
     friend wxBitmapButton;
     friend wxStaticBitmap;
     friend wxFrame;
+    friend wxDialog;
     friend wxTreeCtrl;
 
     GdkPixmap *GetPixmap() const;

include/wx/gtk/dialog.h

@@ -21,6 +21,7 @@
 #include "wx/string.h"
 #include "wx/event.h"
 #include "wx/window.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // forward decls
@@ -74,9 +75,19 @@ class wxDialog: public wxWindow
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
     virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    void SetModal( bool modal );
     virtual void InitDialog(void);
     virtual void Centre( int direction = wxHORIZONTAL );
     
+    virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
+    
+    virtual void SetIcon( const wxIcon &icon );
+    virtual void Iconize( bool WXUNUSED(iconize)) { }
+    virtual bool IsIconized(void) const { return FALSE; }
+    bool Iconized(void) const { return IsIconized(); }
+    virtual void Maximize(void) { }
+    virtual void Restore(void) { }
+    
   private:
   
     friend    wxWindow;
@@ -85,6 +96,7 @@ class wxDialog: public wxWindow
     
     bool       m_modalShowing;
     wxString   m_title;
+    wxIcon     m_icon;
     
     virtual void ImplementSetPosition();
   

include/wx/gtk/font.h

@@ -81,7 +81,7 @@ class wxFont: public wxGDIObject
     friend wxPaintDC;
     friend wxWindow;
     
-    GdkFont* GetInternalFont(float scale = 1.0);
+    GdkFont* GetInternalFont(float scale = 1.0) const;
 
     // no data :-)
 };

include/wx/gtk/frame.h

@@ -89,9 +89,11 @@ public:
   virtual wxString GetTitle() const { return m_title; }
   
   virtual void SetIcon( const wxIcon &icon );
-  void Iconize( bool WXUNUSED(iconize)) { }
-  bool IsIconized(void) const { return FALSE; }
-  bool Iconized(void) const { return FALSE; }
+  virtual void Iconize( bool WXUNUSED(iconize)) { }
+  virtual bool IsIconized(void) const { return FALSE; }
+  bool Iconized(void) const { return IsIconized(); }
+  virtual void Maximize(void) {}
+  virtual void Restore(void) {}
 
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );

include/wx/gtk/mdi.h

@@ -152,7 +152,7 @@ class wxMDIChildFrame: public wxFrame
   virtual void Maximize(void) {}
   virtual void Restore(void) {}
     
-    void OnActivate( wxActivateEvent &event );
+  void OnActivate( wxActivateEvent &event );
     
   public:
   

include/wx/gtk/menu.h

@@ -95,11 +95,12 @@ public:
     // state
   void Enable(bool enable = TRUE) { m_isEnabled = enable; }
   bool IsEnabled() const { return m_isEnabled; }
-  void Check(bool check = TRUE);
+  void Check( bool check = TRUE );
   bool IsChecked() const;
 
     // help string (displayed in the status bar by default)
-  void SetHelpString(const wxString& str) { m_helpStr = str; }
+  void SetHelp(const wxString& str) { m_helpStr = str; }
+  const wxString& GetHelp() const { return m_helpStr; }
 
   // implementation
   void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
@@ -136,7 +137,8 @@ public:
 
     // find item by name/id
   int FindItem( const wxString itemString ) const;
-  wxMenuItem *FindItem(int id) const;
+  wxMenuItem *FindItem( int id ) const;
+  wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 
     // get/set item's state
   void Enable( int id, bool enable );
@@ -145,7 +147,12 @@ public:
   bool IsChecked( int id ) const;
 
   void SetLabel( int id, const wxString &label );
+  wxString GetLabel(int id) const;
 
+  // helpstring
+  virtual void SetHelpString(int id, const wxString& helpString);
+  virtual wxString GetHelpString(int id) const ;
+  
   // accessors
   wxList& GetItems() { return m_items; }
 

include/wx/gtk/window.h

@@ -96,6 +96,9 @@ public:
   virtual void GetPosition( int *x, int *y ) const;
   virtual void Centre( int direction = wxHORIZONTAL );
   virtual void Fit();
+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), 
+    int WXUNUSED(maxH), int WXUNUSED(incW) ) { }
 
   void OnSize( wxSizeEvent &event );
   void OnIdle( wxIdleEvent& event );
@@ -113,7 +116,12 @@ public:
   virtual void RemoveChild( wxWindow *child );
   void SetReturnCode( int retCode );
   int GetReturnCode();
-  wxWindow *GetParent();
+  wxWindow *GetParent() const 
+    { return m_parent; }
+  wxWindow *GetGrandParent(void) const
+    { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
+  void wxWindow::SetParent( wxWindow *p ) 
+    { m_parent = p; }
 
   wxEvtHandler *GetEventHandler();
   void SetEventHandler( wxEvtHandler *handler );
@@ -139,15 +147,22 @@ public:
   virtual void SetBackgroundColour( const wxColour &colour );
   virtual wxColour GetForegroundColour() const;
   virtual void SetForegroundColour( const wxColour &colour );
+  
+  virtual int GetCharHeight(void) const;
+  virtual int GetCharWidth(void) const;
+  virtual void GetTextExtent( const wxString& string, int *x, int *y,
+                             int *descent = NULL,
+                             int *externalLeading = NULL,
+                             const wxFont *theFont = NULL, bool use16 = FALSE) const;
 
   virtual void SetDefaultBackgroundColour( const wxColour& col )
-    { m_defaultBackgroundColour = col; };
+    { m_defaultBackgroundColour = col; }
   virtual wxColour GetDefaultBackgroundColour() const
-    { return m_defaultBackgroundColour; };
+    { return m_defaultBackgroundColour; }
   virtual void SetDefaultForegroundColour( const wxColour& col )
-    { m_defaultForegroundColour = col; };
+    { m_defaultForegroundColour = col; }
   virtual wxColour GetDefaultForegroundColour() const
-    { return m_defaultForegroundColour; };
+    { return m_defaultForegroundColour; }
 
   virtual void SetFont( const wxFont &font );
   virtual wxFont *GetFont();