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

Added missing brush.h includes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-04-27 17:41:29 +00:00
parent 7a618981ce
commit 19c9086b55
15 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/button.cpp
View File

@@ -74,7 +74,7 @@ bool wxButton::Create(wxWindow *parent,
m_backgroundColour = parent->GetBackgroundColour();
m_foregroundColour = parent->GetForegroundColour();
long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD;
long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLINGS */ ;
#ifdef __WIN32__
if(m_windowStyle & wxBU_LEFT)

3
src/msw/choice.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/brush.h"
#include "wx/settings.h"
#endif
@@ -59,7 +60,7 @@ bool wxChoice::Create(wxWindow *parent,
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return FALSE;
long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL /* | WS_CLIPSIBLINGS */;
if ( style & wxCB_SORT )
msStyle |= CBS_SORT;

3
src/msw/combobox.cpp
View File

@@ -35,6 +35,7 @@
#endif
#include "wx/combobox.h"
#include "wx/brush.h"
#include "wx/clipbrd.h"
#include "wx/msw/private.h"
@@ -253,7 +254,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
// get the right style
long msStyle = WS_TABSTOP | WS_VSCROLL | WS_HSCROLL |
CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT;
CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT /* | WS_CLIPSIBLINGS */;
if ( style & wxCB_READONLY )
msStyle |= CBS_DROPDOWNLIST;
else if ( style & wxCB_SIMPLE )

2
src/msw/gauge95.cpp
View File

@@ -67,7 +67,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
int width = size.x;
int height = size.y;
long msFlags = WS_CHILD | WS_VISIBLE;
long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ ;
#ifndef PBS_VERTICAL
#define PBS_VERTICAL 0x04

2
src/msw/listbox.cpp
View File

@@ -156,7 +156,7 @@ bool wxListBox::Create(wxWindow *parent,
m_windowStyle = style;
DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
LBS_NOTIFY | LBS_HASSTRINGS;
LBS_NOTIFY | LBS_HASSTRINGS /* | WS_CLIPSIBLINGS */;
if (m_windowStyle & wxLB_MULTIPLE)
wstyle |= LBS_MULTIPLESEL;
else if (m_windowStyle & wxLB_EXTENDED)

2
src/msw/radiobut.cpp
View File

@@ -78,7 +78,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
groupStyle = WS_GROUP;
// long msStyle = groupStyle | RADIO_FLAGS;
long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE ;
long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
bool want3D;
WXDWORD exStyle = Determine3DEffects(0, &want3D) ;

2
src/msw/spinbutt.cpp
View File

@@ -106,7 +106,7 @@ bool wxSpinButton::Create(wxWindow *parent,
y = 0;
// translate the styles
DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | /* WS_CLIPSIBLINGS | */
UDS_NOTHOUSANDS | // never useful, sometimes harmful
UDS_SETBUDDYINT; // it doesn't harm if we don't have buddy

2
src/msw/spinctrl.cpp
View File

@@ -148,7 +148,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
WS_EX_CLIENTEDGE, // sunken border
_T("EDIT"), // window class
NULL, // no window title
WS_CHILD | WS_BORDER, // style (will be shown later)
WS_CHILD | WS_BORDER /* | WS_CLIPSIBLINGS */, // style (will be shown later)
pos.x, pos.y, // position
0, 0, // size (will be set later)
GetHwndOf(parent), // parent

2
src/msw/statbmp.cpp
View File

@@ -120,7 +120,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
classname,
wxT(""),
// NOT DISABLED!!! We want to move it in Dialog Editor.
winstyle | WS_CHILD | WS_VISIBLE, // | WS_DISABLED,
winstyle | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ , // | WS_DISABLED,
0, 0, 0, 0,
(HWND)parent->GetHWND(),
(HMENU)m_windowId,

2
src/msw/statbr95.cpp
View File

@@ -122,7 +122,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
m_windowId = id == -1 ? NewControlId() : id;
DWORD wstyle = WS_CHILD | WS_VISIBLE;
DWORD wstyle = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ ;
// setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
// (at least in the version of comctl32.dll I'm using), and the only way to

2
src/msw/statline.cpp
View File

@@ -66,7 +66,7 @@ bool wxStaticLine::Create( wxWindow *parent,
(
wxT("STATIC"),
wxT(""),
WS_VISIBLE | WS_CHILD |
WS_VISIBLE | WS_CHILD /* | WS_CLIPSIBLINGS */ |
SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME,
pos.x, pos.y, sizeReal.x, sizeReal.y,
GetWinHwnd(parent),

2
src/msw/stattext.cpp
View File

@@ -57,7 +57,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
m_windowStyle = style;
long msStyle = WS_CHILD|WS_VISIBLE;
long msStyle = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ ;
if (m_windowStyle & wxALIGN_CENTRE)
msStyle |= SS_CENTER;
else if (m_windowStyle & wxALIGN_RIGHT)

2
src/msw/textctrl.cpp
View File

@@ -156,7 +156,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
// translate wxWin style flags to MSW ones, checking for consistency while
// doing it
long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP;
long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP /* | WS_CLIPSIBLINGS */ ;
if ( m_windowStyle & wxTE_MULTILINE )
{
wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),

2
src/msw/treectrl.cpp
View File

@@ -519,7 +519,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
return FALSE;
DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
TVS_HASLINES | TVS_SHOWSELALWAYS;
TVS_HASLINES | TVS_SHOWSELALWAYS /* | WS_CLIPSIBLINGS */;
if ( m_windowStyle & wxTR_HAS_BUTTONS )
wstyle |= TVS_HASBUTTONS;

4
src/msw/window.cpp
View File

@@ -302,7 +302,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
if ( style & wxTHICK_FRAME )
msflags |= WS_THICKFRAME;
//msflags |= WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE;
//msflags |= WS_CHILD /* | WS_CLIPSIBLINGS */ | WS_VISIBLE;
msflags |= WS_CHILD | WS_VISIBLE;
if ( style & wxCLIP_CHILDREN )
msflags |= WS_CLIPCHILDREN;
@@ -2360,7 +2360,7 @@ bool wxWindow::MSWCreate(int id,
{
controlId = id;
// all child windows should clip their siblings
// style |= WS_CLIPSIBLINGS;
// style |= /* WS_CLIPSIBLINGS */ ;
}
wxString className(wclass);