Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 7fe1edcc410552e7991e532e9b74b1acf1ffbee5..707e495537dd56eecaaf1dc1eceeaa571a28e195 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -93,6 +93,82 @@ END_EVENT_TABLE()
 // implementation
 // ===========================================================================
 
 // implementation
 // ===========================================================================
 

+// the grow box has to be implemented as an inactive window, so that nothing can direct
+// the focus to it
+
+class WXDLLIMPEXP_CORE wxBlindPlateWindow : public wxWindow
+{
+public:
+    wxBlindPlateWindow() { Init(); }
+
+    // Old-style constructor (no default values for coordinates to avoid
+    // ambiguity with the new one)
+    wxBlindPlateWindow(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+
+    // Constructor
+    wxBlindPlateWindow(wxWindow *parent,
+            wxWindowID winid = wxID_ANY,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, winid, pos, size, style, name);
+    }
+
+    // Pseudo ctor
+    bool Create(wxWindow *parent,
+                wxWindowID winid = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                const wxString& name = wxPanelNameStr)
+    {
+        if ( !wxWindow::Create(parent, winid, pos, size, style, name) )
+            return false;
+
+        // so that non-solid background renders correctly under GTK+:
+        SetThemeEnabled(true);
+        return true;
+    }
+
+    virtual ~wxBlindPlateWindow();
+
+    virtual bool AcceptsFocus() const
+    {
+        return false;
+    }
+
+protected:
+    // common part of all ctors
+    void Init()
+    {
+    }
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBlindPlateWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+wxBlindPlateWindow::~wxBlindPlateWindow()
+{
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxBlindPlateWindow, wxWindow)
+
+BEGIN_EVENT_TABLE(wxBlindPlateWindow, wxWindow)
+END_EVENT_TABLE()
+
+

 // ----------------------------------------------------------------------------
  // constructors and such
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
  // constructors and such
 // ----------------------------------------------------------------------------


@@ -131,6 +207,7 @@ void wxWindowMac::Init()
     m_macIsUserPane = true;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;
     m_macIsUserPane = true;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;

+    m_isNativeWindowWrapper = false;

 }
 
 wxWindowMac::~wxWindowMac()
 }
 
 wxWindowMac::~wxWindowMac()


@@ -180,11 +257,7 @@ wxWindowMac::~wxWindowMac()
 
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
 
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP

-    if ( m_dropTarget != NULL )
-    {
-        delete m_dropTarget;
-        m_dropTarget = NULL;
-    }
+    wxDELETE(m_dropTarget);

 #endif
 
     delete m_peer ;
 #endif
 
     delete m_peer ;


@@ -338,7 +411,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
 #endif
 
     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
 #endif
 

-    
+

     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :


@@ -396,8 +469,26 @@ bool wxWindowMac::SetForegroundColour(const wxColour& col )
     return retval;
 }
 
     return retval;
 }
 

+bool wxWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
+{
+    if ( !wxWindowBase::SetBackgroundStyle(style) )
+        return false;
+
+    if ( m_peer )
+        m_peer->SetBackgroundStyle(style);
+    return true;
+}
+

 bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 {
 bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 {

+    if (m_growBox)
+    {
+        if ( m_backgroundColour.Ok() )
+            m_growBox->SetBackgroundColour(m_backgroundColour);
+        else
+            m_growBox->SetBackgroundColour(*wxWHITE);
+    }
+

     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 
     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 


@@ -714,7 +805,6 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
 bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 #ifndef __WXUNIVERSAL__
 bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 #ifndef __WXUNIVERSAL__

-    menu->SetInvokingWindow((wxWindow*)this);

     menu->UpdateUI();
 
     if ( x == wxDefaultCoord && y == wxDefaultCoord )
     menu->UpdateUI();
 
     if ( x == wxDefaultCoord && y == wxDefaultCoord )


@@ -728,7 +818,6 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
         ClientToScreen( &x , &y ) ;
     }
     menu->GetPeer()->PopUp(this, x, y);
         ClientToScreen( &x , &y ) ;
     }
     menu->GetPeer()->PopUp(this, x, y);

-    menu->SetInvokingWindow( NULL );

     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation
     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation


@@ -749,7 +838,7 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 
     if ( m_tooltip )
         m_tooltip->SetWindow(this);
 
     if ( m_tooltip )
         m_tooltip->SetWindow(this);

-        
+

     if (m_peer)
         m_peer->SetToolTip(tooltip);
 }
     if (m_peer)
         m_peer->SetToolTip(tooltip);
 }


@@ -1059,16 +1148,16 @@ bool wxWindowMac::Show(bool show)
         m_peer->SetVisibility( show ) ;
 
 #ifdef __WXOSX_IPHONE__
         m_peer->SetVisibility( show ) ;
 
 #ifdef __WXOSX_IPHONE__

-    // only when there's no native event support 
+    // only when there's no native event support

     if ( !IsTopLevel() )
 #endif
     {
         wxShowEvent eventShow(GetId(), show);
         eventShow.SetEventObject(this);
     if ( !IsTopLevel() )
 #endif
     {
         wxShowEvent eventShow(GetId(), show);
         eventShow.SetEventObject(this);

-    
+

         HandleWindowEvent(eventShow);
     }
         HandleWindowEvent(eventShow);
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1531,17 +1620,13 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         child = node->GetData();
         if (child == NULL)
             continue;
         child = node->GetData();
         if (child == NULL)
             continue;

-#if wxUSE_SCROLLBAR
-        if (child == m_vScrollBar)
-            continue;
-        if (child == m_hScrollBar)
-            continue;
-        if (child == m_growBox)
-            continue;
-#endif
+

         if (child->IsTopLevel())
             continue;
 
         if (child->IsTopLevel())
             continue;
 

+        if ( !IsClientAreaChild(child) )
+            continue;
+

         child->GetPosition( &x, &y );
         child->GetSize( &w, &h );
         if (rect)
         child->GetPosition( &x, &y );
         child->GetSize( &w, &h );
         if (rect)


@@ -1890,7 +1975,8 @@ bool wxWindowMac::MacDoRedraw( long time )
             wxFAIL_MSG( "unsupported background style" );
     }
 
             wxFAIL_MSG( "unsupported background style" );
     }
 

-    MacPaintGrowBox();
+    // as this is a full window, shouldn't be necessary anymore
+    // MacPaintGrowBox();

 
     // calculate a client-origin version of the update rgn and set
     // m_updateRegion to that
 
     // calculate a client-origin version of the update rgn and set
     // m_updateRegion to that


@@ -2069,7 +2155,7 @@ void wxWindowMac::MacCreateScrollBars( long style )
 
         wxPoint gPoint(width - scrlsize, height - scrlsize);
         wxSize gSize(scrlsize, scrlsize);
 
         wxPoint gPoint(width - scrlsize, height - scrlsize);
         wxSize gSize(scrlsize, scrlsize);

-        m_growBox = new wxPanel((wxWindow *)this, wxID_ANY, gPoint, gSize, 0);
+        m_growBox = new wxBlindPlateWindow((wxWindow *)this, wxID_ANY, gPoint, gSize, 0);

     }
 
     // because the create does not take into account the client area origin
     }
 
     // because the create does not take into account the client area origin