X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..49746f2306b6eb7ef1c53e63287b3de237ad719e:/src/os2/control.cpp?ds=sidebyside diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 0b16771501..4b4ecbb55c 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: src/os2/control.cpp // Purpose: wxControl class // Author: David Webster // Modified by: @@ -9,22 +9,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "control.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/control.h" + #ifndef WX_PRECOMP -#include "wx/event.h" -#include "wx/app.h" -#include "wx/dcclient.h" -#include "wx/scrolwin.h" -#include "wx/log.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/dcclient.h" + #include "wx/scrolwin.h" + #include "wx/log.h" #endif + +#include "wx/os2/dc.h" #include "wx/os2/private.h" -#include "wx/control.h" IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) @@ -37,15 +36,13 @@ wxControl::wxControl() { } // end of wxControl::wxControl -bool wxControl::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) +bool wxControl::Create( wxWindow* pParent, + wxWindowID vId, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxValidator& rValidator, + const wxString& rsName ) { bool bRval = wxWindow::Create( pParent ,vId @@ -63,23 +60,14 @@ bool wxControl::Create( return bRval; } // end of wxControl::Create -wxControl::~wxControl() -{ - m_isBeingDeleted = true; -} - -bool wxControl::OS2CreateControl( - const wxChar* zClassname -, const wxString& rsLabel -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -) +bool wxControl::OS2CreateControl( const wxChar* zClassname, + const wxString& rsLabel, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle ) { - WXDWORD dwExstyle; - WXDWORD dwStyle = OS2GetStyle( lStyle - ,&dwExstyle - ); + WXDWORD dwExstyle; + WXDWORD dwStyle = OS2GetStyle( lStyle, &dwExstyle ); return OS2CreateControl( zClassname ,dwStyle @@ -112,29 +100,39 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname, if (m_isShown ) dwStyle |= WS_VISIBLE; - wxWindow* pParent = GetParent(); - PSZ zClass = ""; + wxWindow* pParent = GetParent(); + PSZ zClass = ""; if (!pParent) - return FALSE; + return false; - if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0) + if ((wxStrcmp(zClassname, wxT("COMBOBOX"))) == 0) zClass = WC_COMBOBOX; - else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0) + else if ((wxStrcmp(zClassname, wxT("STATIC"))) == 0) zClass = WC_STATIC; - else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0) + else if ((wxStrcmp(zClassname, wxT("BUTTON"))) == 0) zClass = WC_BUTTON; - else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0) + else if ((wxStrcmp(zClassname, wxT("NOTEBOOK"))) == 0) zClass = WC_NOTEBOOK; - else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0) + else if ((wxStrcmp(zClassname, wxT("CONTAINER"))) == 0) zClass = WC_CONTAINER; - dwStyle |= WS_VISIBLE; + if ((zClass == WC_STATIC) || (zClass == WC_BUTTON)) + dwStyle |= DT_MNEMONIC; + + m_dwStyle = dwStyle; + m_label = rsLabel; + wxString label; + if (dwStyle & DT_MNEMONIC) + label = ::wxPMTextToLabel(m_label); + else + label = m_label; - wxString sLabel = ::wxPMTextToLabel(rsLabel); + // clipping siblings does not yet work + dwStyle &= ~WS_CLIPSIBLINGS; m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,(PSZ)zClass // Window class - ,(PSZ)sLabel.c_str() // Initial Text + ,zClass // Window class + ,label.c_str() // Initial Text ,(ULONG)dwStyle // Style flags ,(LONG)0 // X pos of origin ,(LONG)0 // Y pos of origin @@ -149,11 +147,9 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname, if ( !m_hWnd ) { -#ifdef __WXDEBUG__ wxLogError(wxT("Failed to create a control of class '%s'"), zClassname); -#endif // DEBUG - return FALSE; + return false; } // // Subclass again for purposes of dialog editing mode @@ -171,11 +167,7 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname, SetXComp(0); SetYComp(0); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); + SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); return true; } // end of wxControl::OS2CreateControl @@ -186,7 +178,7 @@ wxSize wxControl::DoGetBestSize() const bool wxControl::ProcessCommand(wxCommandEvent& event) { - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } WXHBRUSH wxControl::OnCtlColor(WXHDC hWxDC, @@ -214,12 +206,11 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC hWxDC, return (WXHBRUSH)pBrush->GetResourceHandle(); } // end of wxControl::OnCtlColor -void wxControl::OnEraseBackground( - wxEraseEvent& rEvent -) +void wxControl::OnEraseBackground( wxEraseEvent& rEvent ) { RECTL vRect; - HPS hPS = rEvent.GetDC()->GetHPS(); + wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl(); + HPS hPS = impl->GetHPS(); SIZEL vSize = {0,0}; ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT); @@ -227,29 +218,29 @@ void wxControl::OnEraseBackground( ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel()); } // end of wxControl::OnEraseBackground -WXDWORD wxControl::OS2GetStyle( - long lStyle -, WXDWORD* pdwExstyle -) const +WXDWORD wxControl::OS2GetStyle( long lStyle, WXDWORD* pdwExstyle ) const { - long dwStyle = wxWindow::OS2GetStyle( lStyle - ,pdwExstyle - ); + long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle ); - if (AcceptsFocus()) + if (AcceptsFocusFromKeyboard()) { dwStyle |= WS_TABSTOP; } return dwStyle; } // end of wxControl::OS2GetStyle -void wxControl::SetLabel( - const wxString& rsLabel -) +void wxControl::SetLabel( const wxString& rsLabel ) { - wxString sLabel = ::wxPMTextToLabel(rsLabel); - - ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str()); + if(rsLabel != m_label) + { + m_label = rsLabel; + wxString label; + if (m_dwStyle & DT_MNEMONIC) + label = ::wxPMTextToLabel(m_label); + else + label = m_label; + ::WinSetWindowText(GetHwnd(), label.c_str()); + } } // end of wxControl::SetLabel // ---------------------------------------------------------------------------