Minor modifications...

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index e7438063b8e15a68e1af26cc82393691b9979723..20c067a48cc4253862a1f4337378bb69f4e30ebb 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -236,13 +236,14 @@ public:
   void ConnectWidget( GtkWidget *widget );
   void ConnectDnDWidget( GtkWidget *widget );
   void DisconnectDnDWidget( GtkWidget *widget );
   void ConnectWidget( GtkWidget *widget );
   void ConnectDnDWidget( GtkWidget *widget );
   void DisconnectDnDWidget( GtkWidget *widget );

-
+  

   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
   void PostCreation();
   bool HasVMT();
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
   void PostCreation();
   bool HasVMT();
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();

+  GtkStyle *GetWidgetStyle();

 
   wxWindow            *m_parent;
   wxList               m_children;
 
   wxWindow            *m_parent;
   wxList               m_children;


@@ -274,10 +275,11 @@ public:
   bool                 m_needParent;
   bool                 m_hasScrolling;
   bool                 m_isScrolling;
   bool                 m_needParent;
   bool                 m_hasScrolling;
   bool                 m_isScrolling;

-  bool                 m_hasOwnStyle;

   bool                 m_hasVMT;
   bool                 m_sizeSet;
   bool                 m_resizing;
   bool                 m_hasVMT;
   bool                 m_sizeSet;
   bool                 m_resizing;

+  GdkGC               *m_scrollGC;
+  GtkStyle            *m_widgetStyle;

 
 public:
 
 
 public:
 


@@ -315,11 +317,6 @@ public:
   virtual void GetClientSizeConstraint(int *w, int *h) const ;
   virtual void GetPositionConstraint(int *x, int *y) const ;
 
   virtual void GetClientSizeConstraint(int *w, int *h) const ;
   virtual void GetPositionConstraint(int *x, int *y) const ;
 

-protected:
-  // set background colour for arbitrary window (useful because some windows
-  // don't work with m_wxwindow, e.g. wxTextCtrl)
-  void SetBackgroundColourHelper( const wxColour &colour, GdkWindow *window );
-

 private:
   DECLARE_EVENT_TABLE()
 };
 private:
   DECLARE_EVENT_TABLE()
 };