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

Include wx/checkbox.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@39428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-29 08:13:19 +00:00
parent ef59736105
commit ab1ce969df
9 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cocoa/checkbox.mm
View File

@@ -1,22 +1,23 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cocoa/checkbox.mm // Name: src/cocoa/checkbox.mm
// Purpose: wxCheckBox // Purpose: wxCheckBox
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/03/16 // Created: 2003/03/16
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence // Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
#include "wx/checkbox.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/checkbox.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/cocoa/autorelease.h" #include "wx/cocoa/autorelease.h"

3
src/generic/filedlgg.cpp
View File

@@ -30,12 +30,11 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/bmpbuttn.h" #include "wx/bmpbuttn.h"
#include "wx/checkbox.h"
#endif #endif
#include "wx/checkbox.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/choice.h" #include "wx/choice.h"
#include "wx/checkbox.h"
#include "wx/stattext.h" #include "wx/stattext.h"
#include "wx/longlong.h" #include "wx/longlong.h"
#include "wx/sizer.h" #include "wx/sizer.h"

7
src/msw/checkbox.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: msw/checkbox.cpp // Name: src/msw/checkbox.cpp
// Purpose: wxCheckBox // Purpose: wxCheckBox
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -26,8 +26,9 @@
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
#include "wx/checkbox.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/checkbox.h"
#include "wx/brush.h" #include "wx/brush.h"
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
#include "wx/settings.h" #include "wx/settings.h"
@@ -212,7 +213,7 @@ wxSize wxCheckBox::DoGetBestSize() const
wxString str = wxGetWindowText(GetHWND()); wxString str = wxGetWindowText(GetHWND());
int wCheckbox, hCheckbox; int wCheckbox, hCheckbox;
if ( !str.IsEmpty() ) if ( !str.empty() )
{ {
GetTextExtent(wxStripMenuCodes(str), &wCheckbox, &hCheckbox); GetTextExtent(wxStripMenuCodes(str), &wCheckbox, &hCheckbox);
wCheckbox += s_checkSize + GetCharWidth(); wCheckbox += s_checkSize + GetCharWidth();

55
src/os2/checkbox.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: checkbox.cpp // Name: src/os2/checkbox.cpp
// Purpose: wxCheckBox // Purpose: wxCheckBox
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
@@ -12,8 +12,9 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/checkbox.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/checkbox.h"
#include "wx/brush.h" #include "wx/brush.h"
#include "wx/scrolwin.h" #include "wx/scrolwin.h"
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
@@ -51,20 +52,15 @@ bool wxCheckBox::OS2Command( WXUINT WXUNUSED(uParam),
return true; return true;
} // end of wxCheckBox::OS2Command } // end of wxCheckBox::OS2Command
bool wxCheckBox::Create( bool wxCheckBox::Create(wxWindow* pParent,
wxWindow* pParent wxWindowID vId,
, wxWindowID vId const wxString& rsLabel,
, const wxString& rsLabel const wxPoint& rPos,
, const wxPoint& rPos const wxSize& rSize,
, const wxSize& rSize long lStyle,
, long lStyle const wxValidator& rValidator,
, const wxValidator& rValidator const wxString& rsName )
, const wxString& rsName
)
{ {
LONG lColor;
bool bOk;
if (!CreateControl( pParent if (!CreateControl( pParent
,vId ,vId
,rPos ,rPos
@@ -73,14 +69,12 @@ bool wxCheckBox::Create(
,rValidator ,rValidator
,rsName ,rsName
)) ))
return FALSE; return false;
long osStyle = BS_AUTOCHECKBOX | long osStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE;
WS_TABSTOP |
WS_VISIBLE;
bOk = OS2CreateControl( wxT("BUTTON") bool bOk = OS2CreateControl( wxT("BUTTON")
,osStyle ,osStyle
,rPos ,rPos
,rSize ,rSize
@@ -88,7 +82,8 @@ bool wxCheckBox::Create(
,0 ,0
); );
m_backgroundColour = pParent->GetBackgroundColour(); m_backgroundColour = pParent->GetBackgroundColour();
lColor = (LONG)m_backgroundColour.GetPixel();
LONG lColor = (LONG)m_backgroundColour.GetPixel();
::WinSetPresParam( m_hWnd ::WinSetPresParam( m_hWnd
,PP_BACKGROUNDCOLOR ,PP_BACKGROUNDCOLOR
,sizeof(LONG) ,sizeof(LONG)
@@ -98,11 +93,9 @@ bool wxCheckBox::Create(
return bOk; return bOk;
} // end of wxCheckBox::Create } // end of wxCheckBox::Create
void wxCheckBox::SetLabel( void wxCheckBox::SetLabel( const wxString& rsLabel )
const wxString& rsLabel
)
{ {
wxString sLabel=::wxPMTextToLabel(rsLabel); wxString sLabel=::wxPMTextToLabel(rsLabel);
::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str()); ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
} // end of wxCheckBox::SetLabel } // end of wxCheckBox::SetLabel
@@ -132,14 +125,10 @@ wxSize wxCheckBox::DoGetBestSize() const
nHeightCheckbox = nCheckSize; nHeightCheckbox = nCheckSize;
} }
return wxSize( nWidthCheckbox return wxSize( nWidthCheckbox, nHeightCheckbox );
,nHeightCheckbox
);
} // end of wxCheckBox::DoGetBestSize } // end of wxCheckBox::DoGetBestSize
void wxCheckBox::SetValue( void wxCheckBox::SetValue( bool bValue )
bool bValue
)
{ {
::WinSendMsg(GetHwnd(), BM_SETCHECK, (MPARAM)bValue, 0); ::WinSendMsg(GetHwnd(), BM_SETCHECK, (MPARAM)bValue, 0);
} // end of wxCheckBox::SetValue } // end of wxCheckBox::SetValue
@@ -153,9 +142,7 @@ bool wxCheckBox::GetValue() const
return((LONGFROMMR(::WinSendMsg(GetHwnd(), BM_QUERYCHECK, (MPARAM)0, (MPARAM)0)) == 1L)); return((LONGFROMMR(::WinSendMsg(GetHwnd(), BM_QUERYCHECK, (MPARAM)0, (MPARAM)0)) == 1L));
} // end of wxCheckBox::GetValue } // end of wxCheckBox::GetValue
void wxCheckBox::Command ( void wxCheckBox::Command ( wxCommandEvent& rEvent )
wxCommandEvent& rEvent
)
{ {
SetValue((rEvent.GetInt() != 0)); SetValue((rEvent.GetInt() != 0));
ProcessCommand(rEvent); ProcessCommand(rEvent);

3
src/palmos/checkbox.cpp
View File

@@ -26,8 +26,9 @@
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
#include "wx/checkbox.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/checkbox.h"
#include "wx/brush.h" #include "wx/brush.h"
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
#include "wx/settings.h" #include "wx/settings.h"

2
src/palmos/control.cpp
View File

@@ -35,10 +35,10 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/button.h" #include "wx/button.h"
#include "wx/checkbox.h"
#endif #endif
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/checkbox.h"
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#include "wx/radiobut.h" #include "wx/radiobut.h"
#include "wx/slider.h" #include "wx/slider.h"

2
src/palmos/toplevel.cpp
View File

@@ -34,13 +34,13 @@
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/containr.h" // wxSetFocusToChild() #include "wx/containr.h" // wxSetFocusToChild()
#include "wx/button.h" #include "wx/button.h"
#include "wx/checkbox.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/module.h" #include "wx/module.h"
#include "wx/display.h" #include "wx/display.h"
// controls for sending select event // controls for sending select event
#include "wx/checkbox.h"
#include "wx/radiobut.h" #include "wx/radiobut.h"
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#include "wx/slider.h" #include "wx/slider.h"

3
src/univ/checkbox.cpp
View File

@@ -25,9 +25,10 @@
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
#include "wx/checkbox.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/checkbox.h"
#include "wx/validate.h" #include "wx/validate.h"
#include "wx/button.h" // for wxACTION_BUTTON_XXX #include "wx/button.h" // for wxACTION_BUTTON_XXX

7
src/xrc/xh_chckb.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: xh_chckb.cpp // Name: src/xrc/xh_chckb.cpp
// Purpose: XRC resource for wxCheckBox // Purpose: XRC resource for wxCheckBox
// Author: Bob Mitchell // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
@@ -18,7 +18,10 @@
#if wxUSE_XRC && wxUSE_CHECKBOX #if wxUSE_XRC && wxUSE_CHECKBOX
#include "wx/xrc/xh_chckb.h" #include "wx/xrc/xh_chckb.h"
#include "wx/checkbox.h"
#ifndef WX_PRECOMP
#include "wx/checkbox.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)