changes to wxFRAME_NO_TASKBAR/FLOAT_ON_PARENT styles handling which should
now work more as expected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -946,11 +946,11 @@ enum wxBorder
|
||||
#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
|
||||
|
||||
// deprecated versions defined for compatibility reasons
|
||||
#define wxRESIZE_BOX wxMAXIMIZE_BOX
|
||||
#define wxTHICK_FRAME wxRESIZE_BORDER
|
||||
#define wxFRAME_FLOAT_ON_PARENT wxFRAME_TOOL_WINDOW
|
||||
|
||||
// obsolete styles, unused any more
|
||||
#define wxDIALOG_MODAL 0x0020 // free flag value 0x0020
|
||||
|
@@ -96,6 +96,9 @@ protected:
|
||||
// translate wxWindows flags to Windows ones
|
||||
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
|
||||
|
||||
// choose the right parent to use with CreateWindow()
|
||||
virtual WXHWND MSWGetParent() const;
|
||||
|
||||
// we handle WM_NCACTIVATE specially here
|
||||
virtual long MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
@@ -112,6 +115,10 @@ protected:
|
||||
long m_fsOldWindowStyle;
|
||||
bool m_fsIsMaximized;
|
||||
bool m_fsIsShowing;
|
||||
|
||||
// the hidden parent window for the frames which shouldn't appear in the
|
||||
// taskbar
|
||||
static wxWindow *ms_hiddenParent;
|
||||
};
|
||||
|
||||
// list of all frames and modeless dialogs
|
||||
|
@@ -240,6 +240,9 @@ public:
|
||||
int& x, int& y,
|
||||
int& w, int& h) const;
|
||||
|
||||
// get the HWND to be used as parent of this window with CreateWindow()
|
||||
virtual WXHWND MSWGetParent() const;
|
||||
|
||||
// creates the window of specified Windows class with given style, extended
|
||||
// style, title and geometry (default values
|
||||
//
|
||||
|
Reference in New Issue
Block a user