implement new wxBG_STYLE_XXX semantics for wxMSW too

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index da9e32a5e154ed361e526f518488a4bd767dd518..f86cdec15c137156f655222559567e5dd40db02d 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -795,6 +795,8 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int actualX = x;
     int actualY = y;
 
     int actualX = x;
     int actualY = y;
 

+#if 0
+    // min and max sizes are only for sizers, not for explicit size setting

     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))
     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))


@@ -803,6 +805,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;

+#endif

 
     bool doMove = false, doResize = false ;
 
 
     bool doMove = false, doResize = false ;
 


@@ -1086,8 +1089,11 @@ int wxWindowMac::GetCharWidth() const
     return width;
 }
 
     return width;
 }
 

-void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont ) const
+void wxWindowMac::DoGetTextExtent(const wxString& str,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const

 {
     const wxFont *fontToUse = theFont;
     wxFont tempFont;
 {
     const wxFont *fontToUse = theFont;
     wxFont tempFont;