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

moved dialog/frame styles to their own headers; don't use any styles by default for TLW under Windows CE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-13 12:22:34 +00:00
parent f6d742793e
commit 8b5ef6cfd2
4 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/wx/defs.h
View File

@@ -1180,39 +1180,6 @@ enum wxBorder
#define wxFRAME_EX_CONTEXTHELP 0x00000004 #define wxFRAME_EX_CONTEXTHELP 0x00000004
#define wxDIALOG_EX_CONTEXTHELP 0x00000004 #define wxDIALOG_EX_CONTEXTHELP 0x00000004
/*
* wxFrame/wxDialog style flags
*/
#define wxSTAY_ON_TOP 0x8000
#define wxICONIZE 0x4000
#define wxMINIMIZE wxICONIZE
#define wxMAXIMIZE 0x2000
#define wxCLOSE_BOX 0x1000
#define wxSYSTEM_MENU 0x0800
#define wxMINIMIZE_BOX 0x0400
#define wxMAXIMIZE_BOX 0x0200
#define wxTINY_CAPTION_HORIZ 0x0100
#define wxTINY_CAPTION_VERT 0x0080
#define wxRESIZE_BORDER 0x0040
#define wxDIALOG_NO_PARENT 0x0001 /* Don't make owned by apps top window */
#define wxFRAME_NO_TASKBAR 0x0002 /* No taskbar button (MSW only) */
#define wxFRAME_TOOL_WINDOW 0x0004 /* No taskbar button, no system menu */
#define wxFRAME_FLOAT_ON_PARENT 0x0008 /* Always above its parent */
#define wxFRAME_SHAPED 0x0010 /* Create a window that is able to be shaped */
/* deprecated versions defined for compatibility reasons */
#define wxRESIZE_BOX wxMAXIMIZE_BOX
#define wxTHICK_FRAME wxRESIZE_BORDER
/* obsolete styles, unused any more */
#define wxDIALOG_MODAL 0x0020 /* free flag value 0x0020 */
#define wxDIALOG_MODELESS 0
#define wxNO_3D 0
#define wxUSER_COLOURS 0
/* /*
* MDI parent frame style flags * MDI parent frame style flags
* Can overlap with some of the above. * Can overlap with some of the above.
@@ -1220,13 +1187,6 @@ enum wxBorder
#define wxFRAME_NO_WINDOW_MENU 0x0100 #define wxFRAME_NO_WINDOW_MENU 0x0100
#define wxDEFAULT_FRAME_STYLE \
(wxSYSTEM_MENU | wxRESIZE_BORDER | \
wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxCLOSE_BOX | \
wxCAPTION | wxCLIP_CHILDREN)
#define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
/* /*
* wxExtDialog style flags * wxExtDialog style flags
*/ */

4
include/wx/dialog.h
View File

@@ -20,6 +20,10 @@
#include "wx/containr.h" #include "wx/containr.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#define wxDIALOG_NO_PARENT 0x0001 // Don't make owned by apps top window
#define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow

10
include/wx/frame.h
View File

@@ -32,6 +32,16 @@ class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// wxFrame-specific (i.e. not for wxDialog) styles
#define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only)
#define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu
#define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent
#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxFrame is a top-level window with optional menubar, statusbar and toolbar // wxFrame is a top-level window with optional menubar, statusbar and toolbar
// //

45
include/wx/toplevel.h
View File

@@ -34,6 +34,51 @@ class WXDLLEXPORT wxTopLevelWindowBase;
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// style common to both wxFrame and wxDialog
#define wxSTAY_ON_TOP 0x8000
#define wxICONIZE 0x4000
#define wxMINIMIZE wxICONIZE
#define wxMAXIMIZE 0x2000
#define wxCLOSE_BOX 0x1000
#define wxSYSTEM_MENU 0x0800
#define wxMINIMIZE_BOX 0x0400
#define wxMAXIMIZE_BOX 0x0200
#define wxTINY_CAPTION_HORIZ 0x0100
#define wxTINY_CAPTION_VERT 0x0080
#define wxRESIZE_BORDER 0x0040
// deprecated versions defined for compatibility reasons
#define wxRESIZE_BOX wxMAXIMIZE_BOX
#define wxTHICK_FRAME wxRESIZE_BORDER
// obsolete styles, unused any more
#define wxDIALOG_MODAL 0
#define wxDIALOG_MODELESS 0
#define wxNO_3D 0
#define wxUSER_COLOURS 0
// default style
//
// under Windows CE (at least when compiling with eVC 4) we should create
// top level windows without any styles at all for them to appear
// "correctly", i.e. as full screen windows with a "hide" button (same as
// "close" but round instead of squared and just hides the applications
// instead of closing it) in the title bar
#ifdef __WXWINCE__
#define wxDEFAULT_FRAME_STYLE (0)
#else // !__WXWINCE__
#define wxDEFAULT_FRAME_STYLE \
(wxSYSTEM_MENU | \
wxRESIZE_BORDER | \
wxMINIMIZE_BOX | \
wxMAXIMIZE_BOX | \
wxCLOSE_BOX | \
wxCAPTION | \
wxCLIP_CHILDREN)
#endif
// Dialogs are created in a special way // Dialogs are created in a special way
#define wxTOPLEVEL_EX_DIALOG 0x00000008 #define wxTOPLEVEL_EX_DIALOG 0x00000008