AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include wx/combobox.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@39625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-06-07 22:01:12 +00:00
parent d5bfbd9ab8
commit a5bbd1cc91
6 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cocoa/combobox.mm
View File

@ -78,6 +78,8 @@
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/log.h"
@ -85,7 +87,6 @@
#endif // WX_PRECOMP
#include "wx/cocoa/ObjcPose.h"
#include "wx/combobox.h"
#import <AppKit/NSComboBox.h>
#import <Foundation/NSNotification.h>
@ -160,8 +161,6 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
@end // implementation wxPoserNSComboBox
#include "wx/combobox.h"
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/string.h"

5
src/common/combocmn.cpp
View File

@ -25,9 +25,10 @@
#if wxUSE_COMBOCTRL
#include "wx/combobox.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/combobox.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/dialog.h"
@ -895,7 +896,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
{
int newY = butHeight+(customBorder*2);
SetClientSize(-1,newY);
SetClientSize(wxDefaultCoord,newY);
sz.y = newY;
}
}

2
src/gtk/window.cpp
View File

@ -29,11 +29,11 @@
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#include "wx/toolbar.h"
#include "wx/combobox.h"
#endif
#include "wx/layout.h"
#include "wx/module.h"
#include "wx/combobox.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"

2
src/gtk1/window.cpp
View File

@ -28,11 +28,11 @@
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/textctrl.h"
#include "wx/combobox.h"
#endif
#include "wx/layout.h"
#include "wx/module.h"
#include "wx/combobox.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"

32
src/os2/combobox.cpp
View File

@ -14,11 +14,12 @@
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
#endif
#include "wx/combobox.h"
#include "wx/clipbrd.h"
#include "wx/os2/private.h"
@ -36,35 +37,29 @@ static WXFARPROC gfnWndprocEdit = (WXFARPROC)NULL;
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
bool wxComboBox::OS2Command(
WXUINT uParam
, WXWORD WXUNUSED(wId)
)
bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
{
long lSel = -1L;
wxString sValue;
long lSel = -1L;
wxString sValue;
switch (uParam)
{
case CBN_LBSELECT:
if (GetSelection() > -1)
{
wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED
,GetId()
);
wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
vEvent.SetInt(GetSelection());
vEvent.SetEventObject(this);
vEvent.SetString(GetStringSelection());
ProcessCommand(vEvent);
}
break;
case CBN_EFCHANGE:
{
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,GetId()
);
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );
if (lSel == -1L)
sValue = GetValue();
@ -319,14 +314,11 @@ void wxComboBox::Remove( long lFrom, long lTo)
#endif
} // end of wxComboBox::Remove
void wxComboBox::SetSelection(
long lFrom
, long lTo
)
void wxComboBox::SetSelection( long lFrom, long lTo )
{
HWND hWnd = GetHwnd();
long lFromChar = 0;
long lToChar = 0;
HWND hWnd = GetHwnd();
long lFromChar = 0;
long lToChar = 0;
//
// If from and to are both -1, it means

6
src/xrc/xh_combo.cpp
View File

@ -21,14 +21,14 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/combobox.h"
#endif
#include "wx/combobox.h"
IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
wxComboBoxXmlHandler::wxComboBoxXmlHandler()
: wxXmlResourceHandler() , m_insideBox(false)
:wxXmlResourceHandler()
,m_insideBox(false)
{
XRC_ADD_STYLE(wxCB_SIMPLE);
XRC_ADD_STYLE(wxCB_SORT);