/////////////////////////////////////////////////////////////////////////////
-// Name: control.cpp
+// Name: src/os2/control.cpp
// Purpose: wxControl class
// Author: David Webster
// Modified by:
// 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)
{
} // 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
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
);
} // 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 )
{
//
// Doesn't do anything at all under OS/2
if (dwExstyle == (WXDWORD)-1)
{
dwExstyle = 0;
- (void) OS2GetStyle(GetWindowStyle(), &dwExstyle);
+ (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, wxT("COMBOBOX"))) == 0)
zClass = WC_COMBOBOX;
- else if ((strcmp(zClassname, "STATIC")) == 0)
+ else if ((wxStrcmp(zClassname, wxT("STATIC"))) == 0)
zClass = WC_STATIC;
- else if ((strcmp(zClassname, "BUTTON")) == 0)
+ else if ((wxStrcmp(zClassname, wxT("BUTTON"))) == 0)
zClass = WC_BUTTON;
- else if ((strcmp(zClassname, "NOTEBOOK")) == 0)
+ else if ((wxStrcmp(zClassname, wxT("NOTEBOOK"))) == 0)
zClass = WC_NOTEBOOK;
- else if ((strcmp(zClassname, "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;
+
+ // clipping siblings does not yet work
+ dwStyle &= ~WS_CLIPSIBLINGS;
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
- ,(PSZ)zClass // Window class
- ,(PSZ)rsLabel.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
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
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
bool wxControl::ProcessCommand(wxCommandEvent& event)
{
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(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);
::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();
+ wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+ HPS hPS = impl->GetHPS();
SIZEL vSize = {0,0};
::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);
::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(), 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
// ---------------------------------------------------------------------------
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
-
-
projects / wxWidgets.git / blobdiff