Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/radiobut.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-05 16:46:15 +00:00
parent b3d78b0cc5
commit b0b5881aea
12 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/os2/radiobut.cpp
View File

@@ -13,12 +13,13 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/radiobut.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/radiobut.h"
#include "wx/brush.h"
#include "wx/dcscreen.h"
#include "wx/settings.h"
@@ -34,27 +35,23 @@ extern void wxAssociateWinWithHandle( HWND hWnd
void wxRadioButton::Init()
{
m_bFocusJustSet = FALSE;
m_bFocusJustSet = false;
} // end of wxRadioButton::Init
void wxRadioButton::Command (
wxCommandEvent& rEvent
)
void wxRadioButton::Command ( wxCommandEvent& rEvent )
{
SetValue ((rEvent.GetInt() != 0) );
ProcessCommand (rEvent);
} // end of wxRadioButton::Command
bool wxRadioButton::Create(
wxWindow* pParent
, wxWindowID vId
, const wxString& rsLabel
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxValidator& rValidator
, const wxString& rsName
)
bool wxRadioButton::Create( wxWindow* pParent,
wxWindowID vId,
const wxString& rsLabel,
const wxPoint& rPos,
const wxSize& rSize,
long lStyle,
const wxValidator& rValidator,
const wxString& rsName )
{
if ( !CreateControl( pParent
,vId
@@ -63,7 +60,7 @@ bool wxRadioButton::Create(
,lStyle
,rValidator
,rsName))
return FALSE;
return false;
long lSstyle = WS_TABSTOP;
@@ -93,19 +90,15 @@ bool wxRadioButton::Create(
,rsLabel
,0
))
return FALSE;
return false;
wxAssociateWinWithHandle(m_hWnd, this);
if (HasFlag(wxRB_GROUP))
SetValue(TRUE);
SetValue(true);
SetFont(*wxSMALL_FONT);
SetSize( rPos.x
,rPos.y
,rSize.x
,rSize.y
);
return TRUE;
SetSize( rPos.x, rPos.y, rSize.x, rSize.y );
return true;
} // end of wxRadioButton::Create
wxSize wxRadioButton::DoGetBestSize() const
@@ -170,7 +163,7 @@ bool wxRadioButton::OS2Command( WXUINT wParam, WXWORD WXUNUSED(wId) )
// (presumably when another button is pressed)
//
if (!bIsChecked )
SetValue(TRUE);
SetValue(true);
}
wxCommandEvent rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
rEvent.SetEventObject(this);
@@ -195,17 +188,13 @@ void wxRadioButton::SetFocus()
wxControl::SetFocus();
}
void wxRadioButton::SetLabel(
const wxString& rsLabel
)
void wxRadioButton::SetLabel( const wxString& rsLabel )
{
wxString sLabel = ::wxPMTextToLabel(rsLabel);
::WinSetWindowText((HWND)GetHWND(), (const char *)sLabel.c_str());
} // end of wxRadioButton::SetLabel
void wxRadioButton::SetValue(
bool bValue
)
void wxRadioButton::SetValue( bool bValue )
{
::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);
if (bValue)
@@ -238,7 +227,7 @@ void wxRadioButton::SetValue(
//
break;
}
pBtn->SetValue(FALSE);
pBtn->SetValue(false);
if (pBtn->HasFlag(wxRB_GROUP))
{
//
@@ -268,7 +257,7 @@ void wxRadioButton::SetValue(
//
break;
}
pBtn->SetValue(FALSE);
pBtn->SetValue(false);
}
}
} // end of wxRadioButton::SetValue
@@ -281,14 +270,14 @@ MRESULT wxRadioButton::OS2WindowProc(
{
if (uMsg == WM_SETFOCUS)
{
m_bFocusJustSet = TRUE;
m_bFocusJustSet = true;
MRESULT mRc = wxControl::OS2WindowProc( uMsg
,wParam
,lParam
);
m_bFocusJustSet = FALSE;
m_bFocusJustSet = false;
return mRc;
}
return wxControl::OS2WindowProc( uMsg