diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 9700593435..e65488b210 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -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) diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index a646c1f9e7..204fe50832 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -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; diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 2692928b2c..99930b570d 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -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 ) diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index c43b527cb6..18d6f85897 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -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 diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 00f6e2d1d8..15b3c4c629 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -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) diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index e390f5e247..86afbdb5d4 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -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) ; diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index b5ac43e274..a2927c860d 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -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 diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 9ab077ddee..09b50942ea 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -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 diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 7b939e5ec4..fd9dd5db30 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -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, diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 64b9373220..4843ea05a6 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -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 diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 75bc183dc8..cf085321c9 100644 --- a/src/msw/statline.cpp +++ b/src/msw/statline.cpp @@ -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), diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index b7e0f01365..82b2a21745 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -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) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 8ff0fbe59a..c0f230c15a 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -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), diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 3d0458b7a6..1a6d535c85 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -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; diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 764e82ef59..03049a5b76 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -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);