Small Motif bug fixes

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

diff --git a/docs/motif/changes.txt b/docs/motif/changes.txt
index b8494394f0b14689c61a61887f882722c09f353f..0508aaa92eb49194b993749df810cfa01a8a92e5 100644 (file)
--- a/docs/motif/changes.txt
+++ b/docs/motif/changes.txt
@@ -52,4 +52,12 @@ More recently:
 - Added time.cpp to makefile; set wxUSE_DATETIME to 1.
 - Added a parent-existance check to popup menu code to make it not crash.
 - Added some optimization in wxWindow::SetSize to produce less flicker.
 - Added time.cpp to makefile; set wxUSE_DATETIME to 1.
 - Added a parent-existance check to popup menu code to make it not crash.
 - Added some optimization in wxWindow::SetSize to produce less flicker.

-  It remains to be seen whether this produces any resize bugs.
\ No newline at end of file
+  It remains to be seen whether this produces any resize bugs.
+
+3/12/98
+-------
+
+- Debugged DrawEllipticArc (a ! in the wrong place).
+- Added SetClippingRegion( const wxRegion& region ).
+- Added wxPoint, wxSize, wxRect versions of SetSize etc.
+- Diagnosed but not yet cured a wxTreeCtrl bug (see todo.txt).
\ No newline at end of file

diff --git a/docs/motif/todo.txt b/docs/motif/todo.txt
index 1043abd94ccab518335776b818b75d0772ea17c7..d73aa1bec9e3f112be812f84bd7fb05105a31a79 100644 (file)
--- a/docs/motif/todo.txt
+++ b/docs/motif/todo.txt
@@ -42,6 +42,9 @@ High Priority
 - Tidy dialogs such as the colour and font selectors.
 
 - Use generic wxTreeCtrl, wxListCtrl: debug and enhance these.
 - Tidy dialogs such as the colour and font selectors.
 
 - Use generic wxTreeCtrl, wxListCtrl: debug and enhance these.

+  wxTreeCtrl: crashes in wxImageList::Draw because it assumes
+  that wxBitmap == wxIcon, which is only true in wxGTK.
+  So add wxDC::DrawBitmap and use this instead.

 
 - Find out why modal dialogs give a grab warning.
 
 
 - Find out why modal dialogs give a grab warning.
 

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index ca68dc140af831c4b6f7152444de7a620106abd0..969a44f6545e7dd57838e0f49cf41633eb56fbe4 100644 (file)
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -103,7 +103,7 @@ public:
        bool Combine(const wxRect& rect, wxRegionOp op);
 
     // Get the internal Region handle
        bool Combine(const wxRect& rect, wxRegionOp op);
 
     // Get the internal Region handle

-    WXRegion GetXRegion() ;
+    WXRegion GetXRegion() const;

 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxObject {

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index a91a4e7d5721ee9f511621251091751907783ad1..808dbc3fd0164348a154197e21ab77d1f47490a7 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -354,7 +354,7 @@ void wxWindowDC::DrawEllipticArc( long x, long y, long width, long height, doubl
           XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end);
     }
 
           XLOG2DEV_2 (x), YLOG2DEV_2 (y),wd,hd,start,end);
     }
 

-  if (!m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
+  if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)

     {
       if (m_autoSetting)
     SetPen (m_pen);
     {
       if (m_autoSetting)
     SetPen (m_pen);

diff --git a/src/motif/region.cpp b/src/motif/region.cpp
index 7121fe63a32fb3ec5c0b7f5ce40b4740154d0e6c..d4ced6405db74940d03cb09a86e2fa8f70e151c9 100644 (file)
--- a/src/motif/region.cpp
+++ b/src/motif/region.cpp
@@ -105,7 +105,7 @@ wxRegion::~wxRegion()
 }
 
 // Get the internal region handle
 }
 
 // Get the internal region handle

-WXRegion wxRegion::GetXRegion()
+WXRegion wxRegion::GetXRegion() const

 {
     wxASSERT( m_refData !=NULL );
 
 {
     wxASSERT( m_refData !=NULL );