merge #4 from 2.6 branch

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

diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp
index bef4563dc9df2cc0f083bd1b53f042eb78721c37..39b178e441df15085e0c80c1b4b372221ea4722e 100644 (file)
--- a/wxPython/contrib/activex/wxie/wxactivex.cpp
+++ b/wxPython/contrib/activex/wxie/wxactivex.cpp
@@ -1170,6 +1170,31 @@ void wxActiveX::GetTypeInfo(ITypeInfo *ti, bool defInterface, bool defEventSink)
             ConnectAdvise(ta->guid, disp);
         };
 
             ConnectAdvise(ta->guid, disp);
         };
 

+        // Get properties
+        // See bug #1280715 in the wxActiveX SF project
+        for (int i = 0; i < ta->cVars; i++) {
+            VARDESC FAR *vd = NULL;
+
+            typeInfo->GetVarDesc(i, &vd) ;
+            BSTR bstrProperty = NULL;
+            typeInfo->GetDocumentation(vd->memid, &bstrProperty,
+                                       NULL, NULL, NULL);
+            wxString propName(bstrProperty);
+            m_props.push_back(PropX());
+            int idx = m_props.size() - 1;
+            m_propNames[propName] = idx;
+            m_props[idx].name = propName;
+            m_props[idx].memid = vd->memid;
+
+            ParamX param;
+            param.isSafeArray = false;
+            param.isPtr = false;
+            param.flags = vd->elemdescVar.idldesc.wIDLFlags;
+            param.vt = vd->elemdescVar.tdesc.vt;
+
+            m_props[idx].arg = param;
+            m_props[idx].type = param;
+        }        

 
         // Get Function Names
         for (int i = 0; i < ta->cFuncs; i++)
 
         // Get Function Names
         for (int i = 0; i < ta->cFuncs; i++)

diff --git a/wxPython/docs/CHANGES.html b/wxPython/docs/CHANGES.html
index b2c91c1a7b828424adfbf791c85a6948882ef939..65ea7c18a5636bfe4d245f6129bbca91281de5b6 100644 (file)
--- a/wxPython/docs/CHANGES.html
+++ b/wxPython/docs/CHANGES.html
@@ -12,6 +12,9 @@
 <h1 class="title">Recent Changes for wxPython</h1>
 <div class="section" id="id1">
 <h1><a name="id1">2.6.2.1</a></h1>
 <h1 class="title">Recent Changes for wxPython</h1>
 <div class="section" id="id1">
 <h1><a name="id1">2.6.2.1</a></h1>

+<ul class="simple">
+<li>10-Jan-2006</li>
+</ul>

 <p>wxMSW: Fix for bug #1211907, popup menu indenting inconsistent with
 bitmaps.</p>
 <p>wxMac: Don't send an event for wx.RadioButton deselections, just the
 <p>wxMSW: Fix for bug #1211907, popup menu indenting inconsistent with
 bitmaps.</p>
 <p>wxMac: Don't send an event for wx.RadioButton deselections, just the

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 8ccafeeb9bc5a34a05e420cda312496d836cbd8f..47f20fb7bd7881235744171372c9e007a8817715 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -26,6 +26,7 @@ The following deprecated items have been removed:
 
 2.6.2.1
 -------
 
 2.6.2.1
 -------

+* 10-Jan-2006

 
 wxMSW: Fix for bug #1211907, popup menu indenting inconsistent with
 bitmaps.
 
 wxMSW: Fix for bug #1211907, popup menu indenting inconsistent with
 bitmaps.

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index f547e9f1bf02f15e2f82ab1bcbd0153ea9e9020a..3ab240329107e56b92e94894995963d78bf5a1a4 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -374,7 +374,9 @@ public:
     // SetText()
     virtual void SetAccel(wxAcceleratorEntry *accel);
 
     // SetText()
     virtual void SetAccel(wxAcceleratorEntry *accel);
 

-    
+    void SetBitmap(const wxBitmap& bitmap);
+    const wxBitmap& GetBitmap();
+

     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);
     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);


@@ -405,8 +407,10 @@ public:
         wxColour GetTextColour() { return wxNullColour; }
         void SetBackgroundColour(const wxColour& colBack) {}
         wxColour GetBackgroundColour() { return wxNullColour; }
         wxColour GetTextColour() { return wxNullColour; }
         void SetBackgroundColour(const wxColour& colBack) {}
         wxColour GetBackgroundColour() { return wxNullColour; }

+        

         void SetBitmaps(const wxBitmap& bmpChecked,
         void SetBitmaps(const wxBitmap& bmpChecked,

-                        const wxBitmap& bmpUnchecked = wxNullBitmap) {}
+                        const wxBitmap& bmpUnchecked = wxNullBitmap)
+            { self->SetBitmap( bmpChecked ); }

     
         void SetDisabledBitmap( const wxBitmap& bmpDisabled ) {}
         const wxBitmap& GetDisabledBitmap() const { return wxNullBitmap; }
     
         void SetDisabledBitmap( const wxBitmap& bmpDisabled ) {}
         const wxBitmap& GetDisabledBitmap() const { return wxNullBitmap; }


@@ -419,9 +423,6 @@ public:
         void ResetOwnerDrawn() {}
     }
 #endif
         void ResetOwnerDrawn() {}
     }
 #endif

-
-    void SetBitmap(const wxBitmap& bitmap);
-    const wxBitmap& GetBitmap();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------

diff --git a/wxPython/wx/lib/floatcanvas/FloatCanvas.py b/wxPython/wx/lib/floatcanvas/FloatCanvas.py
index ce5c06179ea7bc337b2ca0a228d0be4faffcab89..eea063af650a969aed550d3d6949fd223a3d3c6f 100644 (file)
--- a/wxPython/wx/lib/floatcanvas/FloatCanvas.py
+++ b/wxPython/wx/lib/floatcanvas/FloatCanvas.py
@@ -1881,7 +1881,7 @@ class FloatCanvas(wx.Panel):
 
         ## create the Hit Test Dicts:
         self.HitDict = None
 
         ## create the Hit Test Dicts:
         self.HitDict = None

-
+        self._HTdc = None

 
         self._DrawList = []
         self._ForeDrawList = []
 
         self._DrawList = []
         self._ForeDrawList = []


@@ -1905,7 +1905,8 @@ class FloatCanvas(wx.Panel):
         self.ObjectUnderMouse = None
         
         # called just to make sure everything is initialized
         self.ObjectUnderMouse = None
         
         # called just to make sure everything is initialized

-        ##self.OnSize(None)
+        # this is a bug on OS-X, maybe it's not required?
+        self.OnSize(None)

 
         self.InHereNum = 0
 
 
         self.InHereNum = 0
 


@@ -2271,6 +2272,7 @@ class FloatCanvas(wx.Panel):
             pass
         
     def MakeNewBuffers(self):
             pass
         
     def MakeNewBuffers(self):

+        #print "Making new buffers"

         self._BackgroundDirty = True
         # Make new offscreen bitmap:
         self._Buffer = wx.EmptyBitmap(*self.PanelSize)
         self._BackgroundDirty = True
         # Make new offscreen bitmap:
         self._Buffer = wx.EmptyBitmap(*self.PanelSize)


@@ -2307,7 +2309,11 @@ class FloatCanvas(wx.Panel):
            self._ForegroundHTdc = None 
     
     def OnSize(self,event):
            self._ForegroundHTdc = None 
     
     def OnSize(self,event):

-        self.PanelSize  = array(self.GetClientSizeTuple(),Int32)
+        self.PanelSize = self.GetClientSizeTuple()
+        if self.PanelSize == (0,0):
+            ## OS-X sometimes gives a Size event when the panel is size (0,0)
+            self.PanelSize = (2,2)
+        self.PanelSize  = array(self.PanelSize,  Int32)

         self.HalfPanelSize = self.PanelSize / 2 # lrk: added for speed in WorldToPixel
         if self.PanelSize[0] == 0 or self.PanelSize[1] == 0:
             self.AspectRatio = 1.0
         self.HalfPanelSize = self.PanelSize / 2 # lrk: added for speed in WorldToPixel
         if self.PanelSize[0] == 0 or self.PanelSize[1] == 0:
             self.AspectRatio = 1.0