wxWS_EX_VALIDATE_RECURSIVELY set by default if parent has it

[wxWidgets.git] / src / os2 / window.cpp

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index ff7acf974fc58a9610f848de408165f835d652f4..088db7e071e2c3d31c0d602ff202ee0d7c1602a4 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -109,9 +109,7 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd);
 // event tables
 // ---------------------------------------------------------------------------
 
 // event tables
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)

-#endif

 
 BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
     EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
 
 BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
     EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)


@@ -124,71 +122,81 @@ END_EVENT_TABLE()
 // implementation
 // ===========================================================================
 
 // implementation
 // ===========================================================================
 

-// Find an item given the MS Windows id
-wxWindow *wxWindow::FindItem(long id) const
+// Find an item given the PM Window id
+wxWindow* wxWindow::FindItem(
+  long                              ulId
+) const

 {
 {

-    wxWindowList::Node *current = GetChildren().GetFirst();
-    while (current)
+    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+
+    while (pCurrent)

     {
     {

-        wxWindow *childWin = current->GetData();
+        wxWindow*                   pChildWin = pCurrent->GetData();
+        wxWindow*                   pWnd = pChildWin->FindItem(ulId);

 
 

-        wxWindow *wnd = childWin->FindItem(id);
-        if ( wnd )
-            return wnd;
+        if (pWnd)
+            return pWnd;

 
 

-        if ( childWin->IsKindOf(CLASSINFO(wxControl)) )
+        if (pChildWin->IsKindOf(CLASSINFO(wxControl)))

         {
         {

-            wxControl *item = (wxControl *)childWin;
-            if ( item->GetId() == id )
-                return item;
+            wxControl*              pItem = (wxControl *)pChildWin;
+
+            if (pItem->GetId() == ulId)
+                return(pItem);

             else
             {
                 // In case it's a 'virtual' control (e.g. radiobox)
             else
             {
                 // In case it's a 'virtual' control (e.g. radiobox)

-                if ( item->GetSubcontrols().Member((wxObject *)id) )
-                    return item;
+                if (pItem->GetSubcontrols().Member((wxObject *)ulId))
+                    return(pItem);

             }
         }
             }
         }

-
-        current = current->GetNext();
+        pCurrent = pCurrent->GetNext();

     }
     }

-
-    return NULL;
+    return(NULL);

 }
 
 }
 

-// Find an item given the MS Windows handle
-wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
+// Find an item given the PM Window handle
+wxWindow* wxWindow::FindItemByHWND(
+  WXHWND                            hWnd
+, bool                              bControlOnly
+) const

 {
 {

-    wxWindowList::Node *current = GetChildren().GetFirst();
-    while (current)
+    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+
+    while (pCurrent)

     {
     {

-        wxWindow *parent = current->GetData();
+        wxWindow*                   pParent = pCurrent->GetData();

 
         // Do a recursive search.
 
         // Do a recursive search.

-        wxWindow *wnd = parent->FindItemByHWND(hWnd);
-        if ( wnd )
-            return wnd;
+        wxWindow*                   pWnd = pParent->FindItemByHWND(hWnd);
+
+        if (pWnd)
+            return(pWnd);

 
 

-        if ( !controlOnly || parent->IsKindOf(CLASSINFO(wxControl)) )
+        if (!bControlOnly || pParent->IsKindOf(CLASSINFO(wxControl)))

         {
         {

-            wxWindow *item = current->GetData();
-            if ( item->GetHWND() == hWnd )
-                return item;
+            wxWindow*               pItem = pCurrent->GetData();
+
+            if (pItem->GetHWND() == hWnd)
+                return(pItem);

             else
             {
             else
             {

-                if ( item->ContainsHWND(hWnd) )
-                    return item;
+                if (pItem->ContainsHWND(hWnd))
+                    return(pItem);

             }
         }
             }
         }

-
-        current = current->GetNext();
+        pCurrent = pCurrent->GetNext();

     }
     }

-    return NULL;
+    return(NULL);

 }
 
 // Default command handler
 }
 
 // Default command handler

-bool wxWindow::OS2Command(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
+bool wxWindow::OS2Command(
+  WXUINT                            WXUNUSED(uParam)
+, WXWORD                            WXUNUSED(uId)
+)

 {
 {

-    return FALSE;
+    return(FALSE);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -201,13 +209,13 @@ void wxWindow::Init()
     InitBase();
 
     // PM specific
     InitBase();
 
     // PM specific

-    m_doubleClickAllowed = 0;
-    m_winCaptured = FALSE;
+    m_bDoubleClickAllowed = 0;
+    m_bWinCaptured = FALSE;

 
     m_isBeingDeleted = FALSE;
 
     m_isBeingDeleted = FALSE;

-    m_oldWndProc = 0;
-    m_useCtl3D = FALSE;
-    m_mouseInWindow = FALSE;
+    m_fnOldWndProc = 0;
+    m_bUseCtl3D = FALSE;
+    m_bMouseInWindow = FALSE;

 
     // wxWnd
     m_hMenu = 0;
 
     // wxWnd
     m_hMenu = 0;


@@ -217,17 +225,17 @@ void wxWindow::Init()
     // pass WM_GETDLGCODE to DefWindowProc()
     m_lDlgCode = 0;
 
     // pass WM_GETDLGCODE to DefWindowProc()
     m_lDlgCode = 0;
 

-    m_xThumbSize = 0;
-    m_yThumbSize = 0;
-    m_backgroundTransparent = FALSE;
+    m_nXThumbSize = 0;
+    m_nYThumbSize = 0;
+    m_bBackgroundTransparent = FALSE;

 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 
 #if wxUSE_MOUSEEVENT_HACK
 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 
 #if wxUSE_MOUSEEVENT_HACK

-    m_lastMouseX =
-    m_lastMouseY = -1;
-    m_lastMouseEvent = -1;
+    m_lLastMouseX =
+    m_lLastMouseY = -1;
+    m_nLastMouseEvent = -1;

 #endif // wxUSE_MOUSEEVENT_HACK
 }
 
 #endif // wxUSE_MOUSEEVENT_HACK
 }
 


@@ -250,30 +258,47 @@ wxWindow::~wxWindow()
     }
 }
 
     }
 }
 

-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
-                      const wxPoint& pos,
-                      const wxSize& size,
-                      long style,
-                      const wxString& name)
-{
-    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
-
-    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
-
-    parent->AddChild(this);
-
-    bool want3D;
-    WXDWORD exStyle = 0; // TODO: Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
-    DWORD   msflags = 0;
-
-
-    // TODO: PM Specific initialization
-    OS2Create(m_windowId, parent, wxCanvasClassName, this, NULL,
-              pos.x, pos.y,
-              WidthDefault(size.x), HeightDefault(size.y),
-              msflags, NULL, exStyle);
-    return TRUE;
+bool wxWindow::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lStyle
+, const wxString&                   rName
+)
+{
+    wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent"));
+
+    if ( !CreateBase( pParent
+                     ,vId
+                     ,rPos
+                     ,rSize
+                     ,lStyle
+                     ,wxDefaultValidator
+                     ,rName
+                    ))
+        return(FALSE);
+
+    pParent->AddChild(this);
+
+    bool                            bWant3D;
+    WXDWORD                         dwExStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D);
+    DWORD                           ulFlags = 0L;
+
+    OS2Create( m_windowId
+              ,pParent
+              ,wxCanvasClassName
+              ,this
+              ,NULL
+              ,rPos.x
+              ,rPos.y
+              ,WidthDefault(rSize.x)
+              ,HeightDefault(rSize.y)
+              ,ulFlags
+              ,NULL
+              ,dwExStyle
+             );
+    return(TRUE);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -282,41 +307,80 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
 void wxWindow::SetFocus()
 {
 
 void wxWindow::SetFocus()
 {

-    // TODO:
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd)
+        ::WinSetFocus(HWND_DESKTOP, hWnd);

 }
 
 wxWindow* wxWindowBase::FindFocus()
 {
 }
 
 wxWindow* wxWindowBase::FindFocus()
 {

-    wxWindow*                       window = NULL;
-    // TODO:
-    return(window);
+    HWND                            hWnd = ::WinQueryFocus(HWND_DESKTOP);
+
+    if (hWnd)
+    {
+        return wxFindWinFromHandle((WXHWND)hWnd);
+    }
+    return NULL;

 }
 
 }
 

-bool wxWindow::Enable(bool enable) // check if base implementation is OK
+bool wxWindow::Enable(
+  bool                              bEnable
+)

 {
 {

-    // TODO:
+    if (!wxWindowBase::Enable(bEnable))
+        return(FALSE);
+
+    HWND                            hWnd = GetHwnd();
+
+    if ( hWnd )
+        ::WinEnableWindow(hWnd, (BOOL)bEnable);
+
+    wxWindowList::Node*             pNode = GetChildren().GetFirst();
+
+    while (pNode)
+    {
+        wxWindow*                   pChild = pNode->GetData();
+
+        pChild->Enable(bEnable);
+        pNode = pNode->GetNext();
+    }

     return(TRUE);
 }
 
     return(TRUE);
 }
 

-bool wxWindow::Show(bool show) // check if base implementation is OK
+bool wxWindow::Show(
+  bool                              bShow
+)

 {
 {

-    // TODO:
+    if (!wxWindowBase::Show(bShow))
+        return(FALSE);
+
+    HWND                            hWnd = GetHwnd();
+
+    ::WinShowWindow(hWnd, bShow);
+
+    if (bShow)
+    {
+        ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
+    }

     return(TRUE);
 }
 
 void wxWindow::Raise()
 {
     return(TRUE);
 }
 
 void wxWindow::Raise()
 {

-    // TODO:
+    ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ACTIVATE);

 }
 
 void wxWindow::Lower()
 {
 }
 
 void wxWindow::Lower()
 {

-    // TODO:
+    ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_DEACTIVATE);

 }
 
 }
 

-void wxWindow::SetTitle( const wxString& title)
+void wxWindow::SetTitle(
+  const wxString&                   rTitle
+)

 {
 {

-// TODO:    SetWindowText(GetHwnd(), title.c_str());
+    ::WinSetWindowText(GetHwnd(), rTitle.c_str());

 }
 
 wxString wxWindow::GetTitle() const
 }
 
 wxString wxWindow::GetTitle() const


@@ -326,24 +390,77 @@ wxString wxWindow::GetTitle() const
 
 void wxWindow::CaptureMouse()
 {
 
 void wxWindow::CaptureMouse()
 {

-    // TODO:
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd && !m_bWinCaptured)
+    {
+        ::WinSetCapture(HWND_DESKTOP, hWnd);
+        m_bWinCaptured = TRUE;
+    }

 }
 
 void wxWindow::ReleaseMouse()
 {
 }
 
 void wxWindow::ReleaseMouse()
 {

-    // TODO:
+    if ( m_bWinCaptured )
+    {
+        ::WinSetCapture(HWND_DESKTOP, NULLHANDLE);
+        m_bWinCaptured = FALSE;
+    }

 }
 
 }
 

-bool wxWindow::SetFont(const wxFont& f)
+bool wxWindow::SetFont(
+  const wxFont&                     rFont
+)

 {
 {

-    // TODO:
+    if (!wxWindowBase::SetFont(rFont))
+    {
+        // nothing to do
+        return(FALSE);
+    }
+
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd != 0)
+    {
+        wxChar                      zFont[128];
+
+        sprintf(zFont, "%d.%s", rFont.GetPointSize(), rFont.GetFaceName().c_str());
+        return(::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont), (PVOID)zFont));
+    }

     return(TRUE);
 }
 
     return(TRUE);
 }
 

-bool wxWindow::SetCursor(const wxCursor& cursor) // check if base implementation is OK
+bool wxWindow::SetCursor(
+  const wxCursor&                   rCursor
+) // check if base implementation is OK

 {
 {

-    // TODO:
-    return(TRUE);
+    if ( !wxWindowBase::SetCursor(rCursor))
+    {
+        // no change
+        return FALSE;
+    }
+
+    wxASSERT_MSG( m_cursor.Ok(),
+                  wxT("cursor must be valid after call to the base version"));
+
+    HWND                            hWnd = GetHwnd();
+    POINTL                          vPoint;
+    RECTL                           vRect;
+    HPS                             hPS;
+    HRGN                            hRGN;
+
+    hPS = ::WinGetPS(hWnd);
+
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+    ::WinQueryWindowRect(hWnd, &vRect);
+
+    hRGN = ::GpiCreateRegion(hPS, 1L, &vRect);
+
+    if ((::GpiPtInRegion(hPS, hRGN, &vPoint) == PRGN_INSIDE) && !wxIsBusy())
+    {
+//        ::SetCursor((HCURSOR)m_cursor.GetHCURSOR());
+    }
+    return TRUE;

 }
 
 void wxWindow::WarpPointer(int x_pos, int y_pos)
 }
 
 void wxWindow::WarpPointer(int x_pos, int y_pos)


@@ -435,7 +552,7 @@ void wxWindow::ScrollWindow( int           dx
 
 void wxWindow::SubclassWin(WXHWND hWnd)
 {
 
 void wxWindow::SubclassWin(WXHWND hWnd)
 {

-    wxASSERT_MSG( !m_oldWndProc, wxT("subclassing window twice?") );
+    wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") );

 
     HWND hwnd = (HWND)hWnd;
 /*
 
     HWND hwnd = (HWND)hWnd;
 /*


@@ -504,7 +621,7 @@ WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders)
 WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle,
                                      bool *want3D) const
 {
 WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle,
                                      bool *want3D) const
 {

-   DWORD exStyle; // remove after implementation doe
+   DWORD exStyle = 0L; // remove after implementation doe

 /* TODO:  this ought to be fun
 *
     // If matches certain criteria, then assume no 3D effects
 /* TODO:  this ought to be fun
 *
     // If matches certain criteria, then assume no 3D effects


@@ -695,12 +812,6 @@ void wxWindow::DoSetSize(int x, int y,
     // TODO:
 }
 
     // TODO:
 }
 

-// for a generic window there is no natural best size - just use the current one
-wxSize wxWindow::DoGetBestSize()
-{
-    return GetSize();
-}
-

 void wxWindow::DoSetClientSize(int width, int height)
 {
     // TODO:
 void wxWindow::DoSetClientSize(int width, int height)
 {
     // TODO:


@@ -864,7 +975,7 @@ void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
 wxWindow *wxWndHook = NULL;
 
 // Main window proc
 wxWindow *wxWndHook = NULL;
 
 // Main window proc

-MRESULT wxWndProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam)
+MRESULT wxWndProc(HWND hWnd, ULONG message, MPARAM wParam, MPARAM lParam)

 {
     // trace all messages - useful for the debugging
 #ifdef __WXDEBUG__
 {
     // trace all messages - useful for the debugging
 #ifdef __WXDEBUG__


@@ -2071,10 +2182,10 @@ bool wxWindow::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)
 
 bool wxWindow::HandleMouseMove(int x, int y, WXUINT flags)
 {
 
 bool wxWindow::HandleMouseMove(int x, int y, WXUINT flags)
 {

-    if ( !m_mouseInWindow )
+    if ( !m_bMouseInWindow )

     {
         // Generate an ENTER event
     {
         // Generate an ENTER event

-        m_mouseInWindow = TRUE;
+        m_bMouseInWindow = TRUE;

 
         wxMouseEvent event(wxEVT_ENTER_WINDOW);
         InitMouseEvent(event, x, y, flags);
 
         wxMouseEvent event(wxEVT_ENTER_WINDOW);
         InitMouseEvent(event, x, y, flags);