Motif bug fixes; dialog OnPaint works now; wxColourDialog tweaking

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

include/wx/help.h

@@ -3,21 +3,16 @@
 
 #ifdef __WXMSW__
 #include "wx/msw/helpwin.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/helpext.h"
 #else
-#include "wx/generic/helpxlp.h"
+#include "wx/generic/helpext.h"
 #endif
 
 #ifdef __WXMSW__
 #define wxHelpController wxWinHelpController
 #define sm_classwxHelpController sm_classwxWinHelpController
-#elif defined(__WXGTK__)
+#else
 #define wxHelpController wxExtHelpController
 #define sm_classwxHelpController sm_classwxExtHelpController
-#else
-#define wxHelpController wxXLPHelpController
-#define sm_classwxHelpController sm_classwxXLPHelpController
 #endif
 
 #endif

include/wx/motif/dcclient.h

@@ -131,7 +131,8 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
   wxPaintDC() {}
-  wxPaintDC(wxWindow* win): wxWindowDC(win) {}
+  wxPaintDC(wxWindow* win);
+  ~wxPaintDC();
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC

include/wx/motif/region.h

@@ -84,7 +84,8 @@ public:
 
 	// Is region empty?
 	bool Empty() const;
-    inline bool IsEmpty() const { return Empty(); }
+        inline bool IsEmpty() const { return Empty(); }
+        bool Ok() const { return (m_refData != NULL) ; }
 
 	//# Tests
 	// Does the region contain the point (x,y)?
@@ -100,6 +101,9 @@ public:
 	bool Combine(long x, long y, long width, long height, wxRegionOp op);
 	bool Combine(const wxRegion& region, wxRegionOp op);
 	bool Combine(const wxRect& rect, wxRegionOp op);
+
+    // Get the internal Region handle
+    WXRegion GetXRegion() ;
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {

include/wx/motif/window.h

@@ -231,7 +231,7 @@ public:
   virtual void DragAcceptFiles(bool accept);
 
   // Update region access
-  virtual wxRegion GetUpdateRegion() const;
+  virtual wxRegion& GetUpdateRegion() const;
   virtual bool IsExposed(int x, int y, int w, int h) const;
   virtual bool IsExposed(const wxPoint& pt) const;
   virtual bool IsExposed(const wxRect& rect) const;
@@ -486,6 +486,7 @@ public:
 
   /// Motif-specific
 
+  void ClearUpdateRects();
   void CanvasGetSize(int* width, int* height) const; // If have drawing area
   void CanvasGetClientSize(int *width, int *height) const;
   void CanvasGetPosition(int *x, int *y) const; // If have drawing area
@@ -518,7 +519,6 @@ public:
   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 ChangeFont(bool keepOriginalSize = TRUE);             // Change to the current font (often overridden)
@@ -594,7 +594,6 @@ public:
   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;