]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/window.cpp
rtti api mods added
[wxWidgets.git] / src / os2 / window.cpp
index 7903c10e6c5bf4e28758a0f84e6258c8925cde0a..d638bce330bdc4d1ac1f79077125cc97de222c3e 100644 (file)
@@ -691,81 +691,11 @@ void wxWindowOS2::WarpPointer(
     ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
 } // end of wxWindowOS2::WarpPointer
 
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const
-{
-}
-#endif // WXWIN_COMPATIBILITY
 
 // ---------------------------------------------------------------------------
 // scrolling stuff
 // ---------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::SetScrollRange(
-  int                               nOrient
-, int                               nRange
-, bool                              bRefresh
-)
-{
-    int                             nRange1 = nRange;
-    int                             nPageSize = GetScrollPage(nOrient);
-
-    if (nPpageSize > 1 && nRange > 0)
-    {
-        nRange1 += (nPageSize - 1);
-    }
-
-    if (nOrient == wxHORIZONTAL)
-    {
-        ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
-        ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
-    }
-    else
-    {
-        ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
-        ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
-    }
-} // end of wxWindowOS2::SetScrollRange
-
-void wxWindowOS2::SetScrollPage(
-  int                               nOrient
-, int                               nPage
-, bool                              bRefresh
-)
-{
-    if (nOrient == wxHORIZONTAL )
-        m_nXThumbSize = nPage;
-    else
-        m_nYThumbSize = nPage;
-} // end of wxWindowOS2::SetScrollPage
-
-int wxWindowOS2::OldGetScrollRange(
-  int                               nOrient
-) const
-{
-    MRESULT                         mRc;
-    HWND                            hWnd = GetHwnd();
-
-    if (hWnd)
-    {
-        mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L);
-        return(SHORT2FROMMR(mRc));
-     }
-     return 0;
-} // end of wxWindowOS2::OldGetScrollRange
-
-int  wxWindowOS2::GetScrollPage(
-  int                               nOrient
-) const
-{
-    if (nOrient == wxHORIZONTAL)
-        return m_nXThumbSize;
-    else
-        return m_nYThumbSize;
-} // end of wxWindowOS2::GetScrollPage
-#endif // WXWIN_COMPATIBILITY
-
 int  wxWindowOS2::GetScrollPos(
   int                               nOrient
 ) const
@@ -1277,43 +1207,6 @@ WXDWORD wxWindowOS2::Determine3DEffects(
     return dwStyle;
 } // end of wxWindowOS2::Determine3DEffects
 
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::OnCommand(
-  wxWindow&                         rWin
-, wxCommandEvent&                   rEvent
-)
-{
-    if (GetEventHandler()->ProcessEvent(rEvent))
-        return;
-    if (m_parent)
-        m_parent->GetEventHandler()->OnCommand( rWin
-                                               ,rEvent
-                                              );
-} // end of wxWindowOS2::OnCommand
-
-wxObject* wxWindowOS2::GetChild(
-  int                               nNumber
-) const
-{
-    //
-    // Return a pointer to the Nth object in the Panel
-    //
-    wxNode*                         pNode = GetChildren().First();
-    int                             n = nNumber;
-
-    while (pNode && n--)
-        pNode = pNode->Next();
-    if (pNode)
-    {
-        wxObject*                   pObj = (wxObject*)pNode->Data();
-        return(pObj);
-    }
-    else
-        return NULL;
-} // end of wxWindowOS2::GetChild
-
-#endif // WXWIN_COMPATIBILITY
-
 //
 // Setup background and foreground colours correctly
 //
@@ -1364,8 +1257,8 @@ void wxWindowOS2::OnIdle(
             (void)GetEventHandler()->ProcessEvent(rEvent);
         }
     }
-    if (wxUpdateUIEvent::CanUpdate())
-        UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 } // end of wxWindowOS2::OnIdle
 
 //
@@ -1385,17 +1278,6 @@ bool wxWindowOS2::Reparent(
     return TRUE;
 } // end of wxWindowOS2::Reparent
 
-void wxWindowOS2::Clear()
-{
-    wxClientDC                      vDc((wxWindow*)this);
-    wxBrush                         vBrush( GetBackgroundColour()
-                                           ,wxSOLID
-                                          );
-
-    vDc.SetBackground(vBrush);
-    vDc.Clear();
-} // end of wxWindowOS2::Clear
-
 void wxWindowOS2::Update()
 {
     ::WinUpdateWindow(GetHwnd());
@@ -2148,67 +2030,6 @@ bool wxWindowOS2::IsMouseInWindow() const
     return hWnd != NULL;
 } // end of wxWindowOS2::IsMouseInWindow
 
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowOS2::CreateCaret(
-  int                               nWidth
-, int                               nHeight
-)
-{
-    SetCaret(new wxCaret( this
-                         ,nWidth
-                         ,nHeight
-                        ));
-} // end of wxWindowOS2::CreateCaret
-
-void wxWindowOS2::CreateCaret(
-  const wxBitmap*                   pBitmap
-)
-{
-    wxFAIL_MSG("not implemented");
-} // end of wxWindowOS2::CreateCaret
-
-void wxWindowOS2::ShowCaret(
-  bool                              bShow
-)
-{
-    wxCHECK_RET( m_caret, "no caret to show" );
-
-    m_caret->Show(bShow);
-} // end of wxWindowOS2::ShowCaret
-
-void wxWindowOS2::DestroyCaret()
-{
-    SetCaret(NULL);
-} // end of wxWindowOS2::DestroyCaret
-
-void wxWindowOS2::SetCaretPos(
-  int                               nX
-, int                               nY)
-{
-    wxCHECK_RET( m_caret, "no caret to move" );
-
-    m_caret->Move( nX
-                  ,nY
-                 );
-} // end of wxWindowOS2::SetCaretPos
-
-void wxWindowOS2::GetCaretPos(
-  int*                              pX
-, int*                              pY
-) const
-{
-    wxCHECK_RET( m_caret, "no caret to get position of" );
-
-    m_caret->GetPosition( pX
-                         ,pY
-                        );
-} // end of wxWindowOS2::GetCaretPos
-
-#endif //wxUSE_CARET
 
 // ---------------------------------------------------------------------------
 // popup menu