fix warnings about unused parameters/variables in release build

[wxWidgets.git] / src / mac / carbon / mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index ef630d2fc88c1004bf5034f2589b4a0c1cdf4e0b..3f3131746c1d1c3e46a4811048bed2936caa2514 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -40,7 +40,7 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
     EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
     EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 

-static const wxChar *TRACE_MDI = _T("mdi");
+#define TRACE_MDI "mdi"

 
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;


@@ -48,6 +48,37 @@ static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;
 
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;
 

+// others
+
+void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
+{
+#if 1 // TODO REMOVE
+    if ( inWindowRef )
+    {
+//        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
+//        if ( inActivate != isHighlighted )
+#ifndef __LP64__
+        GrafPtr port ;
+        GetPort( &port ) ;
+        SetPortWindowPort( inWindowRef ) ;
+#endif
+        HiliteWindow( inWindowRef , inActivate ) ;
+        ControlRef control = NULL ;
+        ::GetRootControl( inWindowRef , &control ) ;
+        if ( control )
+        {
+            if ( inActivate )
+                ::ActivateControl( control ) ;
+            else
+                ::DeactivateControl( control ) ;
+        }
+#ifndef __LP64__
+        SetPort( port ) ;
+#endif
+    }
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // Parent frame
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Parent frame
 // ----------------------------------------------------------------------------


@@ -88,12 +119,14 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }
 
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }
 

-    wxFrame::Create( parent , id , title , pos , size , style , name ) ;
+    if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) )
+        return false;
+

     m_parentFrameActive = true;
 
     m_parentFrameActive = true;
 

-    OnCreateClient();
+    m_clientWindow = OnCreateClient();

 
 

-    return true;
+    return m_clientWindow != NULL;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()


@@ -244,9 +277,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {

-    m_clientWindow = new wxMDIClientWindow( this );
-
-    return m_clientWindow;
+    return new wxMDIClientWindow( this );

 }
 
 // Responds to colour changes, and passes event on to children.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -480,7 +511,7 @@ void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const
 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour

-void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
+void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))

 {
 }
 
 {
 }