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

Replace wxTINY_CAPTION_{HORIZ,VERT} with a single wxTINY_CAPTION.

Browse Source 
These two styles were always equivalent so we can just as well replace them
with a single one and stop wasting an extra bit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-10 21:09:57 +00:00
parent f16fad90b2
commit 7282b0678a
12 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk1/minifram.h
View File

@@ -38,7 +38,7 @@ public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
@@ -49,7 +49,7 @@ public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION,
const wxString& name = wxFrameNameStr);
virtual void SetTitle( const wxString &title );

2
include/wx/motif/minifram.h
View File

@@ -27,7 +27,7 @@ public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION,
const wxString& name = wxFrameNameStr)
{
// Use wxFrame constructor in absence of more specific code.

2
include/wx/osx/minifram.h
View File

@@ -27,7 +27,7 @@ public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION_HORIZ,
long style = wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION,
const wxString& name = wxFrameNameStr)
{
// Use wxFrame constructor in absence of more specific code.

13
include/wx/toplevel.h
View File

@@ -48,7 +48,7 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
| | | | | | | | | | \________________
| | | | | | | | | \___________________ wxRESIZE_BORDER
| | | | | | | | \______________________ wxTINY_CAPTION_VERT
| | | | | | | \_________________________ wxTINY_CAPTION_HORIZ
| | | | | | | \_________________________
| | | | | | \____________________________ wxMAXIMIZE_BOX
| | | | | \_______________________________ wxMINIMIZE_BOX
| | | | \__________________________________ wxSYSTEM_MENU
@@ -74,10 +74,17 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
#define wxSYSTEM_MENU 0x0800
#define wxMINIMIZE_BOX 0x0400
#define wxMAXIMIZE_BOX 0x0200
#define wxTINY_CAPTION_HORIZ 0x0100
#define wxTINY_CAPTION_VERT 0x0080
#define wxTINY_CAPTION 0x0080 // clashes with wxNO_DEFAULT
#define wxRESIZE_BORDER 0x0040
#if WXWIN_COMPATIBILITY_2_8
// HORIZ and VERT styles are equivalent anyhow so don't use different names
// for them
#define wxTINY_CAPTION_HORIZ wxTINY_CAPTION
#define wxTINY_CAPTION_VERT wxTINY_CAPTION
#endif
#if WXWIN_COMPATIBILITY_2_6
// deprecated versions defined for compatibility reasons

2
include/wx/x11/minifram.h
View File

@@ -27,7 +27,7 @@ public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION,
const wxString& name = wxFrameNameStr)
{
// Use wxFrame constructor in absence of more specific code.