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

Added wxCLIP_CHILDREN style (mainly for getting rid of flicker), other minor mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-06-22 22:27:14 +00:00
parent f54f3bffce
commit 565215b26a
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/defs.h
View File

@@ -312,8 +312,11 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
// OBSOLETE - use wxNO_CTL3D instead // OBSOLETE - use wxNO_CTL3D instead
#define wxNO_3D 0x00800000 #define wxNO_3D 0x00800000
// Override CTL3D or native 3D styles for children // Override CTL3D or native 3D styles for children
#define wxOVERRIDE_KEY_TRANSLATIONS 0x00400000 #define wxCLIP_CHILDREN 0x00400000
// TODO: do we need this??? (Motif only) // Clip children when painting, which reduces flicker in
// e.g. frames and splitter windows, but can't be used in
// a panel where a static box must be 'transparent' (panel
// paints the background for it)
// Add this style to a panel to get tab traversal working // Add this style to a panel to get tab traversal working
// outside of dialogs. // outside of dialogs.
@@ -343,7 +346,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
#define wxDIALOG_MODAL 0x0020 #define wxDIALOG_MODAL 0x0020
#define wxDIALOG_MODELESS 0x0000 #define wxDIALOG_MODELESS 0x0000
#define wxDEFAULT_FRAME_STYLE (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION) #define wxDEFAULT_FRAME_STYLE (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
#define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
@@ -541,7 +544,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
* wxStatusBar95 flags * wxStatusBar95 flags
*/ */
#define wxSB_SIZEGRIP 0x0002 #define wxST_SIZEGRIP 0x0002
/* /*
* GDI descriptions * GDI descriptions

2
include/wx/generic/splitter.h
View File

@@ -58,7 +58,7 @@ class WXDLLEXPORT wxSplitterWindow: public wxWindow
// Normal constructor // Normal constructor
wxSplitterWindow(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxSplitterWindow(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const long style = wxSP_3D, const wxString& name = "splitter"); const wxSize& size = wxDefaultSize, const long style = wxSP_3D|wxCLIP_CHILDREN, const wxString& name = "splitter");
~wxSplitterWindow(void); ~wxSplitterWindow(void);
// Gets the only or left/top pane // Gets the only or left/top pane

2
include/wx/menuitem.h
View File

@@ -16,6 +16,8 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h"
// an exception to the general rule that a normal header doesn't include other // an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want // headers - only because ownerdrw.h is not always included and I don't want
// to write #ifdef's everywhere... // to write #ifdef's everywhere...

2
include/wx/msw/setup.h
View File

@@ -249,7 +249,7 @@
#define USE_PENWINDOWS 0 #define USE_PENWINDOWS 0
// Set to 1 to use PenWindows // Set to 1 to use PenWindows
#define USE_OWNER_DRAWN 1 #define USE_OWNER_DRAWN 0
// Owner-drawn menus and listboxes // Owner-drawn menus and listboxes
#define USE_NATIVE_STATUSBAR 1 #define USE_NATIVE_STATUSBAR 1

4
include/wx/msw/statbr95.h
View File

@@ -21,10 +21,10 @@ class WXDLLEXPORT wxStatusBar95 : public wxStatusBar
public: public:
// ctors // ctors
wxStatusBar95(); wxStatusBar95();
wxStatusBar95(wxWindow *parent, wxWindowID id = -1, long style = wxSB_SIZEGRIP); wxStatusBar95(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
// create status line // create status line
bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxSB_SIZEGRIP); bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
// a status line can have several (<256) fields numbered from 0 // a status line can have several (<256) fields numbered from 0
virtual void SetFieldsCount(int number = 1, const int *widths = NULL); virtual void SetFieldsCount(int number = 1, const int *widths = NULL);