X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfcebdb1bba3369205b6693f2593f74394354edd..a7d5151df02bf70a9f6ff1c5c7fd33ab07bf409c:/src/os2/control.cpp?ds=sidebyside diff --git a/src/os2/control.cpp b/src/os2/control.cpp index a50497174d..69a1a79243 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -1,18 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: src/os2/control.cpp // Purpose: wxControl class // Author: David Webster // Modified by: // Created: 09/17/99 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "control.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,6 +17,7 @@ #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" @@ -34,10 +31,6 @@ END_EVENT_TABLE() // Item members wxControl::wxControl() { - -#if WXWIN_COMPATIBILITY - m_callback = 0; -#endif // WXWIN_COMPATIBILITY } // end of wxControl::wxControl bool wxControl::Create( @@ -46,9 +39,7 @@ bool wxControl::Create( , const wxPoint& rPos , const wxSize& rSize , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { @@ -70,21 +61,17 @@ bool wxControl::Create( wxControl::~wxControl() { - m_isBeingDeleted = TRUE; + 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 @@ -95,50 +82,58 @@ bool wxControl::OS2CreateControl( ); } // end of wxControl::OS2CreateControl -bool wxControl::OS2CreateControl( - const wxChar* zClassname -, WXDWORD dwStyle -, const wxPoint& rPos -, const wxSize& rSize -, const wxString& rsLabel -, WXDWORD dwExstyle -) +bool wxControl::OS2CreateControl( const wxChar* zClassname, + WXDWORD dwStyle, + const wxPoint& rPos, + const wxSize& rSize, + const wxString& rsLabel, + WXDWORD dwExstyle ) { - bool bWant3D = FALSE; - // // Doesn't do anything at all under OS/2 // if (dwExstyle == (WXDWORD)-1) { - dwExstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D); + dwExstyle = 0; + (void) OS2GetStyle(GetWindowStyle(), &dwExstyle); } // - // All controls should have these styles (wxWindows creates all controls + // All controls should have these styles (wxWidgets creates all controls // visible by default) // if (m_isShown ) dwStyle |= WS_VISIBLE; - wxWindow* pParent = GetParent(); - PSZ zClass; + wxWindow* pParent = GetParent(); + PSZ zClass = ""; if (!pParent) - return FALSE; + return false; - if ((strcmp(zClassname, "COMBOBOX")) == 0) + if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0) zClass = WC_COMBOBOX; - else if ((strcmp(zClassname, "STATIC")) == 0) + else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0) zClass = WC_STATIC; - else if ((strcmp(zClassname, "BUTTON")) == 0) + else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0) zClass = WC_BUTTON; - else if ((strcmp(zClassname, "NOTEBOOK")) == 0) + else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0) zClass = WC_NOTEBOOK; - dwStyle |= WS_VISIBLE; + else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0) + zClass = WC_CONTAINER; + 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; m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle ,(PSZ)zClass // Window class - ,(PSZ)rsLabel.c_str() // Initial Text + ,(PSZ)label.c_str() // Initial Text ,(ULONG)dwStyle // Style flags ,(LONG)0 // X pos of origin ,(LONG)0 // Y pos of origin @@ -157,7 +152,7 @@ bool wxControl::OS2CreateControl( 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 @@ -165,17 +160,18 @@ bool wxControl::OS2CreateControl( SubclassWin(m_hWnd); // - // Controls use the same font and colours as their parent dialog by default + // Controls use the same colours as their parent dialog by default // InheritAttributes(); + // + // All OS/2 ctrls use the small font + // + SetFont(*wxSMALL_FONT); + SetXComp(0); SetYComp(0); - SetSize( rPos.x - ,rPos.y - ,rSize.x - ,rSize.y - ); - return TRUE; + SetSize( rPos.x, rPos.y, rSize.x, rSize.y ); + return true; } // end of wxControl::OS2CreateControl wxSize wxControl::DoGetBestSize() const @@ -185,31 +181,19 @@ wxSize wxControl::DoGetBestSize() const bool wxControl::ProcessCommand(wxCommandEvent& event) { -#if WXWIN_COMPATIBILITY - if ( m_callback ) - { - (void)(*m_callback)(this, event); - - return TRUE; - } - else -#endif // WXWIN_COMPATIBILITY - return GetEventHandler()->ProcessEvent(event); } -WXHBRUSH wxControl::OnCtlColor( - WXHDC hWxDC -, WXHWND hWnd -, WXUINT uCtlColor -, WXUINT uMessage -, WXWPARAM wParam -, WXLPARAM lParam -) +WXHBRUSH wxControl::OnCtlColor(WXHDC hWxDC, + WXHWND WXUNUSED(hWnd), + WXUINT WXUNUSED(uCtlColor), + WXUINT WXUNUSED(uMessage), + WXWPARAM WXUNUSED(wParam), + WXLPARAM WXUNUSED(lParam)) { - HPS hPS = (HPS)hWxDC; // pass in a PS handle in OS/2 - wxColour vColFore = GetForegroundColour(); - wxColour vColBack = GetBackgroundColour(); + HPS hPS = (HPS)hWxDC; // pass in a PS handle in OS/2 + wxColour vColFore = GetForegroundColour(); + wxColour vColBack = GetBackgroundColour(); if (GetParent()->GetTransparentBackground()) ::GpiSetBackMix(hPS, BM_LEAVEALONE); @@ -219,15 +203,13 @@ WXHBRUSH wxControl::OnCtlColor( ::GpiSetBackColor(hPS, vColBack.GetPixel()); ::GpiSetColor(hPS, vColFore.GetPixel()); - wxBrush* pBrush = wxTheBrushList->FindOrCreateBrush( vColBack - ,wxSOLID - ); + wxBrush* pBrush = wxTheBrushList->FindOrCreateBrush( vColBack + ,wxSOLID + ); 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(); @@ -238,14 +220,9 @@ 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()) { @@ -254,6 +231,20 @@ WXDWORD wxControl::OS2GetStyle( return dwStyle; } // end of wxControl::OS2GetStyle +void wxControl::SetLabel( const wxString& rsLabel ) +{ + if(rsLabel != m_label) + { + m_label = rsLabel; + wxString label; + if (m_dwStyle & DT_MNEMONIC) + label = ::wxPMTextToLabel(m_label); + else + label = m_label; + ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str()); + } +} // end of wxControl::SetLabel + // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- @@ -284,11 +275,9 @@ void wxFindMaxSize( if (nRight > pRect->xRight) pRect->xRight = nRight; - if (nTop < pRect->yTop) + if (nTop > pRect->yTop) pRect->yTop = nTop; - if (nBottom > pRect->yBottom) + if (nBottom < pRect->yBottom) pRect->yBottom = nBottom; } // end of wxFindMaxSize - -