Return raw text, not markup, from wxWebViewWebKit::GetSelectedText().

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 4a137ff4b2f8e53ec8ffb5101db5afd65bab2e39..bba95e6e8a8b774daf545d098876a66228583ad5 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -872,9 +872,22 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
 
 #endif
     if (x)
 
 #endif
     if (x)

-       *x = ww;
+    {
+        // we shouldn't return invalid width
+        if ( ww < 0 )
+            ww = 0;
+        
+        *x = ww;
+    }
+    

     if (y)
     if (y)

-       *y = hh;
+    {
+        // we shouldn't return invalid height
+        if ( hh < 0 )
+            hh = 0;
+        
+        *y = hh;
+    }

 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)


@@ -1219,7 +1232,7 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
     }
 }
 
     }
 }
 

-float wxWindowMac::GetContentScaleFactor() const 
+double wxWindowMac::GetContentScaleFactor() const 

 {
     return GetPeer()->GetContentScaleFactor();
 }
 {
     return GetPeer()->GetContentScaleFactor();
 }


@@ -2774,6 +2787,10 @@ bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 // wxWidgetImpl
 //
 
 // wxWidgetImpl
 //
 

+// we are maintaining a n:1 map from native controls (ControlRef / NSView*) to their wxWidgetImpl
+// n:1 because we might have an embedded view eg within a scrollview, both being part of the same impl
+// the impl is calling Associate with its newly created native control(s), e.g. in InstallHandler
+

 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;
 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;