Rewrite. Cursor handling better, split Layout() and Draw(), faster.

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index b4fc2002ed57f24a663956c38f730831d5479ebe..50556991dcef5719f02f0dfd7010dde250a64eb7 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -82,7 +82,7 @@ public:
 
   virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName, 
                                  const wxResourceTable *table = (const wxResourceTable *) NULL);
-  virtual wxControl *CreateItem( const wxItemResource *childResource, 
+  virtual wxControl *CreateItem(const wxItemResource* childResource, const wxItemResource* parentResource,
                                  const wxResourceTable *table = (const wxResourceTable *) NULL);
 
   bool Close( bool force = FALSE );
@@ -105,6 +105,14 @@ public:
 
   virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
 
+  // Dialog units translations. Implemented in wincmn.cpp.
+  wxPoint ConvertPixelsToDialog(const wxPoint& pt) ;
+  wxPoint ConvertDialogToPixels(const wxPoint& pt) ;
+  inline wxSize ConvertPixelsToDialog(const wxSize& sz)
+  { wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
+  inline wxSize ConvertDialogToPixels(const wxSize& sz)
+  { wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
+
   void OnSize( wxSizeEvent &event );
   void OnIdle( wxIdleEvent& event );
 
@@ -167,15 +175,6 @@ public:
                              int *externalLeading = (int *) NULL,
                              const wxFont *theFont = (const wxFont *) NULL, bool use16 = FALSE) const;
 
-  virtual void SetDefaultBackgroundColour( const wxColour& col )
-    { m_defaultBackgroundColour = col; }
-  virtual wxColour GetDefaultBackgroundColour() const
-    { return m_defaultBackgroundColour; }
-  virtual void SetDefaultForegroundColour( const wxColour& col )
-    { m_defaultForegroundColour = col; }
-  virtual wxColour GetDefaultForegroundColour() const
-    { return m_defaultForegroundColour; }
-
   virtual void SetFont( const wxFont &font );
   virtual wxFont *GetFont();
   // For backward compatibility
@@ -237,6 +236,8 @@ public:
   void ConnectWidget( GtkWidget *widget );
   void ConnectDnDWidget( GtkWidget *widget );
   void DisconnectDnDWidget( GtkWidget *widget );
+  
+  void SetBackgroundColourHelper( GdkWindow *window );
 
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
@@ -259,9 +260,7 @@ public:
   wxCursor            *m_cursor;
   wxFont               m_font;
   wxColour             m_backgroundColour;
-  wxColour             m_defaultBackgroundColour;
   wxColour             m_foregroundColour ;
-  wxColour             m_defaultForegroundColour;
   wxRegion             m_updateRegion;
   long                 m_windowStyle;
   bool                 m_isShown;
@@ -276,6 +275,7 @@ public:
   float                m_oldVerticalPos;
   bool                 m_needParent;
   bool                 m_hasScrolling;
+  bool                 m_isScrolling;
   bool                 m_hasOwnStyle;
   bool                 m_hasVMT;
   bool                 m_sizeSet;
@@ -317,6 +317,7 @@ public:
   virtual void GetClientSizeConstraint(int *w, int *h) const ;
   virtual void GetPositionConstraint(int *x, int *y) const ;
 
+private:
   DECLARE_EVENT_TABLE()
 };