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

GetHandle() added (back)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-05-10 22:29:23 +00:00
parent 739730cae7
commit d7c24517cb
4 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/gtk/window.h
View File

@@ -107,6 +107,8 @@ public:
// implementation // implementation
// -------------- // --------------
virtual WXWidget GetHandle() const { return m_widget; }
// wxWindows callbacks // wxWindows callbacks
void OnKeyDown( wxKeyEvent &event ); void OnKeyDown( wxKeyEvent &event );
@@ -192,27 +194,23 @@ public:
bool m_isFrame:1; /* faster than IS_KIND_OF */ bool m_isFrame:1; /* faster than IS_KIND_OF */
bool m_acceptsFocus:1; /* ! wxStaticBox etc. */ bool m_acceptsFocus:1; /* ! wxStaticBox etc. */
// these are true if the style were set before the // these are true if the style were set before the widget was realized
// widget was realized (typcally in the constructor) // (typcally in the constructor) but the actual GTK style must not be set
// but the actual GTK style must not be set before // before the widget has been "realized"
// the widget has been "realized"
bool m_delayedFont:1; bool m_delayedFont:1;
bool m_delayedForegroundColour:1; bool m_delayedForegroundColour:1;
bool m_delayedBackgroundColour:1; bool m_delayedBackgroundColour:1;
bool m_delayedCursor:1; bool m_delayedCursor:1;
// contains GTK's widgets internal information // contains GTK's widgets internal information about non-default widget
// about non-default widget font and colours. // font and colours. we create one for each widget that gets any
// we create one for each widget that gets any // non-default attribute set via SetFont() or SetForegroundColour() /
// non-default attribute set via SetFont() or // SetBackgroundColour().
// SetForegroundColour() / SetBackgroundColour().
GtkStyle *m_widgetStyle; GtkStyle *m_widgetStyle;
// C++ has no virtual methods in the constrcutor // C++ has no virtual methods in the constrcutor of any class but we need
// of any class but we need different methods // different methods of inserting a child window into a wxFrame,
// of inserting a child window into a wxFrame, // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
// wxMDIFrame, wxNotebook etc. this is the
// callback that will get used.
wxInsertChildFunction m_insertCallback; wxInsertChildFunction m_insertCallback;
// implement the base class pure virtuals // implement the base class pure virtuals

26
include/wx/gtk1/window.h
View File

@@ -107,6 +107,8 @@ public:
// implementation // implementation
// -------------- // --------------
virtual WXWidget GetHandle() const { return m_widget; }
// wxWindows callbacks // wxWindows callbacks
void OnKeyDown( wxKeyEvent &event ); void OnKeyDown( wxKeyEvent &event );
@@ -192,27 +194,23 @@ public:
bool m_isFrame:1; /* faster than IS_KIND_OF */ bool m_isFrame:1; /* faster than IS_KIND_OF */
bool m_acceptsFocus:1; /* ! wxStaticBox etc. */ bool m_acceptsFocus:1; /* ! wxStaticBox etc. */
// these are true if the style were set before the // these are true if the style were set before the widget was realized
// widget was realized (typcally in the constructor) // (typcally in the constructor) but the actual GTK style must not be set
// but the actual GTK style must not be set before // before the widget has been "realized"
// the widget has been "realized"
bool m_delayedFont:1; bool m_delayedFont:1;
bool m_delayedForegroundColour:1; bool m_delayedForegroundColour:1;
bool m_delayedBackgroundColour:1; bool m_delayedBackgroundColour:1;
bool m_delayedCursor:1; bool m_delayedCursor:1;
// contains GTK's widgets internal information // contains GTK's widgets internal information about non-default widget
// about non-default widget font and colours. // font and colours. we create one for each widget that gets any
// we create one for each widget that gets any // non-default attribute set via SetFont() or SetForegroundColour() /
// non-default attribute set via SetFont() or // SetBackgroundColour().
// SetForegroundColour() / SetBackgroundColour().
GtkStyle *m_widgetStyle; GtkStyle *m_widgetStyle;
// C++ has no virtual methods in the constrcutor // C++ has no virtual methods in the constrcutor of any class but we need
// of any class but we need different methods // different methods of inserting a child window into a wxFrame,
// of inserting a child window into a wxFrame, // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
// wxMDIFrame, wxNotebook etc. this is the
// callback that will get used.
wxInsertChildFunction m_insertCallback; wxInsertChildFunction m_insertCallback;
// implement the base class pure virtuals // implement the base class pure virtuals

8
include/wx/msw/window.h
View File

@@ -165,8 +165,9 @@ public:
// simple accessors // simple accessors
// ---------------- // ----------------
WXHWND GetHWND() const { return GetHandle(); } WXHWND GetHWND() const { return m_hWnd; }
void SetHWND(WXHWND hWnd) { m_widget = hWnd; } void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
virtual WXWidget GetHandle() const { return GetHWND(); }
bool GetUseCtl3D() const { return m_useCtl3D; } bool GetUseCtl3D() const { return m_useCtl3D; }
bool GetTransparentBackground() const { return m_backgroundTransparent; } bool GetTransparentBackground() const { return m_backgroundTransparent; }
@@ -340,6 +341,9 @@ public:
} }
protected: protected:
// the window handle
WXHWND m_hWnd;
// the old window proc (we subclass all windows) // the old window proc (we subclass all windows)
WXFARPROC m_oldWndProc; WXFARPROC m_oldWndProc;

23
include/wx/window.h
View File

@@ -595,27 +595,14 @@ public:
void OnSysColourChanged( wxSysColourChangedEvent& event ); void OnSysColourChanged( wxSysColourChangedEvent& event );
void OnInitDialog( wxInitDialogEvent &event ); void OnInitDialog( wxInitDialogEvent &event );
/* // get the haqndle of the window for the underlying window system: this
// What is this doing in the platform independent part? // is only used for wxWin itself or for user code which wants to call
// No doc specifies this. Of what use would that be? // platform-specific APIs
virtual WXWidget GetHandle() const = 0;
// the window handle (for the underlying windowing system)
union
{
// we have 2 common names for this member, one for MSW and the other
// for the rest of the world
WXWidget m_widget;
WXWidget m_hWnd;
};
// accessor
WXWidget GetHandle() const { return m_widget; }
*/
protected: protected:
// the window id - a number which uniquely identifies a window among // the window id - a number which uniquely identifies a window among
// its siblings unless it is -1 // its siblings unless it is -1
wxWindowID m_windowId; wxWindowID m_windowId;
// the parent window of this window (or NULL) and the list of the children // the parent window of this window (or NULL) and the list of the children