Turned wxIcon inline constructors to real constructors

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 346fb13f40d34499df5f32b2dd210867db03655b..e0dc7aae9c6f50b3c924b9e1e7bd92d830761d0f 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/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 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();
@@ -220,7 +235,6 @@ public:         // cannot get private going yet
   bool HasVMT();
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
-  void GetDrawingOffset( long *x, long *y );
 
   wxWindow       *m_parent;
   wxList          m_children;
@@ -242,7 +256,6 @@ public:         // cannot get private going yet
   bool            m_isShown;
   bool            m_isEnabled;
   wxString        m_windowName;
-  long            m_drawingOffsetX,m_drawingOffsetY;
 
   GtkWidget      *m_widget;
   GtkWidget      *m_wxwindow;