X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/253293c10326afa0226932eab4753d188e1e22e2..761df41e86ceeed56d32c038a6c9f88554d4f47a:/src/univ/topluniv.cpp?ds=sidebyside

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index 27a2633365..6dceed79d7 100644
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -79,7 +79,7 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
     if ( ms_drawDecorations == -1 )
     {
         ms_drawDecorations = 
-            !wxSystemSettings::GetCapability(wxSYS_CAN_DRAW_FRAME_DECORATIONS) 
+            !wxSystemSettings::HasFeature(wxSYS_CAN_DRAW_FRAME_DECORATIONS) 
             || wxGetEnv(wxT("WXDECOR"), NULL);
         // FIXME -- wxUniv should provide a way to force non-native decorations!
         //          $WXDECOR is just a hack in absence of better wxUniv solution
@@ -87,7 +87,7 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
 
     if ( ms_canIconize == -1 )
     {
-        ms_canIconize = wxSystemSettings::GetCapability(wxSYS_CAN_ICONIZE_FRAME);
+        ms_canIconize = wxSystemSettings::HasFeature(wxSYS_CAN_ICONIZE_FRAME);
     }
 
     if ( ms_drawDecorations )
@@ -265,7 +265,7 @@ long wxTopLevelWindow::HitTest(const wxPoint& pt) const
     wxTopLevelWindowNative::DoGetClientSize(&w, &h);
     wxRect rect(wxTopLevelWindowNative::GetClientAreaOrigin(), wxSize(w, h));
 
-    return m_renderer->HitTestFrame(rect, pt, GetDecorationsStyle());
+    return m_renderer->HitTestFrame(rect, pt+GetClientAreaOrigin(), GetDecorationsStyle());
 }
 
 // ----------------------------------------------------------------------------