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

Catching up

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-06-17 22:08:57 +00:00
parent f52640f373
commit 47df2b8c54
12 changed files with 188 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/os2/frame.h
View File

@@ -62,7 +62,6 @@ public:
virtual void Raise(void);
// event handlers
void OnActivate(wxActivateEvent& rEvent);
void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
// Toolbar
@@ -122,12 +121,6 @@ public:
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips
//
// Called by wxWindow whenever it gets focus
//
void SetLastFocus(wxWindow* pWin) { m_pWinLastFocused = pWin; }
wxWindow *GetLastFocus(void) const { return m_pWinLastFocused; }
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
@@ -188,7 +181,6 @@ protected:
bool m_bFsIsShowing;
bool m_bWasMinimized;
bool m_bIsShown;
wxWindow* m_pWinLastFocused;
private:
#if wxUSE_TOOLTIPS

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

@@ -21,7 +21,10 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
public:
wxPopupWindow() { }
wxPopupWindow(wxWindow* pParent) { (void)Create(pParent); }
wxPopupWindow( wxWindow* pParent
,int nFlags
)
{ (void)Create(pParent, nFlags); }
bool Create( wxWindow* pParent
,int nFlags = wxBORDER_NONE
@@ -30,19 +33,8 @@ public:
// 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
) const;
@@ -50,6 +42,11 @@ protected:
virtual WXDWORD OS2GetStyle( long lFlags
,WXDWORD* dwExstyle
) const;
//
// Get the HWND to be used as parent of this window with CreateWindow()
//
virtual WXHWND OS2GetParent(void) const;
//
// The list of all currently shown popup windows used by FindPopupFor()
//

4
include/wx/os2/radiobox.h
View File

@@ -70,7 +70,7 @@ public:
void Command(wxCommandEvent& rEvent);
bool ContainsHWND(WXHWND hWnd) const;
bool Enable(bool bEnable);
virtual bool Enable(bool bEnable = TRUE);
void Enable( int nItem
,bool bEnable
);
@@ -87,7 +87,7 @@ public:
,WXWORD wId
);
void SendNotificationEvent(void);
void Show( int nItem
virtual void Show( int nItem
,bool bShow = TRUE
) ;
bool Show(bool bShow);

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

@@ -86,6 +86,11 @@ public:
// --------------------------
//
PSWP GetSwpClient(void) { return &m_vSwpClient; }
void OnActivate(wxActivateEvent& rEvent);
void SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; }
wxWindow* GetLastFocus(void) const { return m_pWinLastFocused; }
protected:
//
// Common part of all ctors
@@ -157,11 +162,15 @@ protected:
bool m_bFsIsMaximized;
bool m_bFsIsShowing;
wxWindow* m_pWinLastFocused;
WXHWND m_hFrame;
SWP m_vSwp;
SWP m_vSwpClient;
static bool m_sbInitialized;
static wxWindow* m_spHiddenParent;
DECLARE_EVENT_TABLE()
}; // end of CLASS wxTopLevelWindowOS2
//

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

@@ -237,6 +237,10 @@ public:
WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; }
void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; }
//
// Return TRUE if the window is of a standard (i.e. not wxWindows') class
//
bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }
wxWindow* FindItem(long lId) const;
wxWindow* FindItemByHWND( WXHWND hWnd
@@ -503,7 +507,6 @@ protected:
bool m_bUseCtl3D:1; // Using CTL3D for this control
bool m_bBackgroundTransparent:1;
bool m_bMouseInWindow:1;
bool m_bDoubleClickAllowed:1;
bool m_bLastKeydownProcessed:1;
bool m_bWinCaptured:1;
WXDWORD m_dwExStyle;