Some more Motif work; included utils.h in fileconf.cpp (for wxGetHomeDir or something)

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

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index f85c06aef75b2999fba17c6d906c2b4a9d764349..031695ff677986ca3b2c29936eb67e089a09cb94 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -85,8 +85,8 @@ class WXDLLEXPORT wxWindow: public wxEvtHandler
 {
   DECLARE_ABSTRACT_CLASS(wxWindow)
 
 {
   DECLARE_ABSTRACT_CLASS(wxWindow)
 

-  friend class wxDC;
-  friend class wxPaintDC;
+  friend class WXDLLEXPORT wxDC;
+  friend class WXDLLEXPORT wxWindowDC;

 
 public:
   wxWindow();
 
 public:
   wxWindow();


@@ -480,6 +480,11 @@ public:
   virtual WXWindow GetXWindow() const;
   virtual WXDisplay *GetXDisplay() const;
 
   virtual WXWindow GetXWindow() const;
   virtual WXDisplay *GetXDisplay() const;
 

+  virtual WXPixmap GetBackingPixmap() const { return m_backingPixmap; }
+  inline int GetPixmapWidth() const { return m_pixmapWidth; }
+  inline int GetPixmapHeight() const { return m_pixmapHeight; }
+  virtual WXRegion GetPaintRegion() const { return m_paintRegion; }
+

   // Change properties
   virtual void ChangeColour(WXWidget widget);
   virtual void ChangeFont(WXWidget widget);
   // Change properties
   virtual void ChangeColour(WXWidget widget);
   virtual void ChangeFont(WXWidget widget);


@@ -546,6 +551,8 @@ public:
   long                  m_lastTS;      // last timestamp
   int                   m_lastButton;  // last pressed button
   wxList                m_updateRects;     // List of wxRectangles representing damaged region
   long                  m_lastTS;      // last timestamp
   int                   m_lastButton;  // last pressed button
   wxList                m_updateRects;     // List of wxRectangles representing damaged region

+  bool                  m_isShown;
+  WXRegion              m_paintRegion; // Clip region generated by expose event

 protected:
   WXWidget              m_mainWidget;
   WXWidget              m_hScrollBar;
 protected:
   WXWidget              m_mainWidget;
   WXWidget              m_hScrollBar;


@@ -554,7 +561,6 @@ protected:
   WXWidget              m_scrolledWindow;
   WXWidget              m_drawingArea;
   bool                  m_winCaptured;
   WXWidget              m_scrolledWindow;
   WXWidget              m_drawingArea;
   bool                  m_winCaptured;

-  bool                  m_isShown;

   bool                  m_hScroll;
   bool                  m_vScroll;
   bool                  m_hScrollingEnabled;
   bool                  m_hScroll;
   bool                  m_vScroll;
   bool                  m_hScrollingEnabled;