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

Catching up for the week

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-05-28 21:50:34 +00:00
parent d30ff492f0
commit 6ed98c6a3b
8 changed files with 262 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/os2/popupwin.h
View File

@@ -26,6 +26,22 @@ public:
bool Create( wxWindow* pParent
,int nFlags = wxBORDER_NONE
);
//
// Implementation only from now on
// -------------------------------
//
//
// Override Show() to prevent wxPopupWindow from being activated
//
virtual bool Show(bool show = TRUE);
//
// Find a shown popup window with the given window as parent, return NULL
// if none
//
static wxPopupWindow *FindPopupFor(wxWindow* pWin);
protected:
virtual void DoGetPosition( int* pnX
,int* pny
@@ -34,6 +50,11 @@ protected:
virtual WXDWORD OS2GetStyle( long lFlags
,WXDWORD* dwExstyle
) const;
//
// The list of all currently shown popup windows used by FindPopupFor()
//
static wxWindowList m_svShownPopups;
DECLARE_DYNAMIC_CLASS(wxPopupWindow)
}; // end of CLASS wxPopupWindow

7
include/wx/os2/toplevel.h
View File

@@ -131,6 +131,12 @@ protected:
virtual WXDWORD OS2GetStyle( long lFlag
,WXDWORD* pdwExstyle
) const;
//
// Choose the right parent to use with CreateWindow()
//
virtual WXHWND OS2GetParent(void) const;
//
// Is the frame currently iconized?
//
@@ -155,6 +161,7 @@ protected:
SWP m_vSwp;
SWP m_vSwpClient;
static bool m_sbInitialized;
static wxWindow* m_spHiddenParent;
}; // end of CLASS wxTopLevelWindowOS2
//

3
include/wx/os2/window.h
View File

@@ -272,6 +272,9 @@ public:
{ return OS2GetStyle(GetWindowStyle(), pdwExflags); }
// get the HWND to be used as parent of this window with CreateWindow()
virtual WXHWND OS2GetParent(void) const;
// returns TRUE if the window has been created
bool OS2Create( PSZ zClass
,const char* zTitle