X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c299c3ab663257429983c24e6fb71450f3cf9f1..c921fd5994d6d22b08ec98512eb59ee6f8939460:/src/os2/control.cpp diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 35551cb4b4..218236ec34 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -20,6 +20,8 @@ #include "wx/event.h" #include "wx/app.h" #include "wx/dcclient.h" +#include "wx/scrolwin.h" +#include "wx/log.h" #endif #include "wx/os2/private.h" #include "wx/control.h" @@ -45,9 +47,7 @@ bool wxControl::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -73,35 +73,25 @@ wxControl::~wxControl() } bool wxControl::OS2CreateControl( - wxWindow* pParent -, wxWindowID vId + const wxChar* zClassname +, const wxString& rsLabel , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS -, const wxValidator& rValidator -#endif -, const wxString& rsName ) { - // - // Even if it's possible to create controls without parents in some port, - // it should surely be discouraged because it doesn't work at all under - // Windows - // - if (!CreateBase( pParent - ,vId - ,rPos - ,rSize - ,lStyle -#if wxUSE_VALIDATORS - ,rValidator -#endif - ,rsName - )) - return FALSE; - pParent->AddChild(this); - return TRUE; + WXDWORD dwExstyle; + WXDWORD dwStyle = OS2GetStyle( lStyle + ,&dwExstyle + ); + + return OS2CreateControl( zClassname + ,dwStyle + ,rPos + ,rSize + ,rsLabel + ,dwExstyle + ); } // end of wxControl::OS2CreateControl bool wxControl::OS2CreateControl( @@ -113,45 +103,63 @@ bool wxControl::OS2CreateControl( , WXDWORD dwExstyle ) { + bool bWant3D = FALSE; + // // Doesn't do anything at all under OS/2 // if (dwExstyle == (WXDWORD)-1) { - dwExstyle = GetExStyle(dwStyle); + dwExstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D); } + // + // All controls should have these styles (wxWindows creates all controls + // visible by default) + // + if (m_isShown ) + dwStyle |= WS_VISIBLE; - if ( !m_hWnd ) - { -#ifdef __WXDEBUG__ - wxLogError(wxT("Failed to create a control of class '%s'"), zClassname); -#endif // DEBUG + wxWindow* pParent = GetParent(); + PSZ zClass; + if (!pParent) return FALSE; - } - - PSZ zClass; if ((strcmp(zClassname, "COMBOBOX")) == 0) zClass = WC_COMBOBOX; else if ((strcmp(zClassname, "STATIC")) == 0) zClass = WC_STATIC; + else if ((strcmp(zClassname, "BUTTON")) == 0) + zClass = WC_BUTTON; + else if ((strcmp(zClassname, "NOTEBOOK")) == 0) + zClass = WC_NOTEBOOK; + else if ((strcmp(zClassname, "CONTAINER")) == 0) + zClass = WC_CONTAINER; dwStyle |= WS_VISIBLE; - m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle - ,(PSZ)zClassname // Window class - ,(PSZ)rsLabel.c_str() // Initial Text - ,(ULONG)dwStyle // Style flags - ,(LONG)rPos.x // X pos of origin - ,(LONG)rPos.y // Y pos of origin - ,(LONG)rSize.x // control width - ,(LONG)rSize.y // control height - ,(HWND)GetHwndOf(GetParent()) // owner window handle (same as parent - ,HWND_TOP // initial z position - ,(ULONG)GetId() // Window identifier - ,NULL // no control data - ,NULL // no Presentation parameters + + m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle + ,(PSZ)zClass // Window class + ,(PSZ)rsLabel.c_str() // Initial Text + ,(ULONG)dwStyle // Style flags + ,(LONG)0 // X pos of origin + ,(LONG)0 // Y pos of origin + ,(LONG)0 // control width + ,(LONG)0 // control height + ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent + ,HWND_TOP // initial z position + ,(ULONG)GetId() // Window identifier + ,NULL // no control data + ,NULL // no Presentation parameters ); + if ( !m_hWnd ) + { +#ifdef __WXDEBUG__ + wxLogError(wxT("Failed to create a control of class '%s'"), zClassname); +#endif // DEBUG + + return FALSE; + } // // Subclass again for purposes of dialog editing mode // @@ -161,6 +169,13 @@ bool wxControl::OS2CreateControl( // Controls use the same font and colours as their parent dialog by default // InheritAttributes(); + SetXComp(0); + SetYComp(0); + SetSize( rPos.x + ,rPos.y + ,rSize.x + ,rSize.y + ); return TRUE; } // end of wxControl::OS2CreateControl @@ -224,17 +239,21 @@ void wxControl::OnEraseBackground( ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); } // end of wxControl::OnEraseBackground -WXDWORD wxControl::GetExStyle( - WXDWORD& rStyle +WXDWORD wxControl::OS2GetStyle( + long lStyle +, WXDWORD* pdwExstyle ) const { - // - // Meaningless under OS/2, just return what was sent - // - WXDWORD exStyle = rStyle; + long dwStyle = wxWindow::OS2GetStyle( lStyle + ,pdwExstyle + ); - return exStyle; -} // end of wxControl::GetExStyle + if (AcceptsFocus()) + { + dwStyle |= WS_TABSTOP; + } + return dwStyle; +} // end of wxControl::OS2GetStyle // --------------------------------------------------------------------------- // global functions