diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index b43b7e8c1c..84de58e5ff 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -107,6 +107,8 @@ public: // implementation // -------------- + virtual WXWidget GetHandle() const { return m_widget; } + // wxWindows callbacks void OnKeyDown( wxKeyEvent &event ); @@ -192,27 +194,23 @@ public: bool m_isFrame:1; /* faster than IS_KIND_OF */ bool m_acceptsFocus:1; /* ! wxStaticBox etc. */ - // these are true if the style were set before the - // widget was realized (typcally in the constructor) - // but the actual GTK style must not be set before - // the widget has been "realized" + // these are true if the style were set before the widget was realized + // (typcally in the constructor) but the actual GTK style must not be set + // before the widget has been "realized" bool m_delayedFont:1; bool m_delayedForegroundColour:1; bool m_delayedBackgroundColour:1; bool m_delayedCursor:1; - // contains GTK's widgets internal information - // about non-default widget font and colours. - // we create one for each widget that gets any - // non-default attribute set via SetFont() or - // SetForegroundColour() / SetBackgroundColour(). + // contains GTK's widgets internal information about non-default widget + // font and colours. we create one for each widget that gets any + // non-default attribute set via SetFont() or SetForegroundColour() / + // SetBackgroundColour(). GtkStyle *m_widgetStyle; - // C++ has no virtual methods in the constrcutor - // of any class but we need different methods - // of inserting a child window into a wxFrame, - // wxMDIFrame, wxNotebook etc. this is the - // callback that will get used. + // C++ has no virtual methods in the constrcutor of any class but we need + // different methods of inserting a child window into a wxFrame, + // wxMDIFrame, wxNotebook etc. this is the callback that will get used. wxInsertChildFunction m_insertCallback; // implement the base class pure virtuals diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index b43b7e8c1c..84de58e5ff 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -107,6 +107,8 @@ public: // implementation // -------------- + virtual WXWidget GetHandle() const { return m_widget; } + // wxWindows callbacks void OnKeyDown( wxKeyEvent &event ); @@ -192,27 +194,23 @@ public: bool m_isFrame:1; /* faster than IS_KIND_OF */ bool m_acceptsFocus:1; /* ! wxStaticBox etc. */ - // these are true if the style were set before the - // widget was realized (typcally in the constructor) - // but the actual GTK style must not be set before - // the widget has been "realized" + // these are true if the style were set before the widget was realized + // (typcally in the constructor) but the actual GTK style must not be set + // before the widget has been "realized" bool m_delayedFont:1; bool m_delayedForegroundColour:1; bool m_delayedBackgroundColour:1; bool m_delayedCursor:1; - // contains GTK's widgets internal information - // about non-default widget font and colours. - // we create one for each widget that gets any - // non-default attribute set via SetFont() or - // SetForegroundColour() / SetBackgroundColour(). + // contains GTK's widgets internal information about non-default widget + // font and colours. we create one for each widget that gets any + // non-default attribute set via SetFont() or SetForegroundColour() / + // SetBackgroundColour(). GtkStyle *m_widgetStyle; - // C++ has no virtual methods in the constrcutor - // of any class but we need different methods - // of inserting a child window into a wxFrame, - // wxMDIFrame, wxNotebook etc. this is the - // callback that will get used. + // C++ has no virtual methods in the constrcutor of any class but we need + // different methods of inserting a child window into a wxFrame, + // wxMDIFrame, wxNotebook etc. this is the callback that will get used. wxInsertChildFunction m_insertCallback; // implement the base class pure virtuals diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index b6dc6f7900..f84926536d 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -165,8 +165,9 @@ public: // simple accessors // ---------------- - WXHWND GetHWND() const { return GetHandle(); } - void SetHWND(WXHWND hWnd) { m_widget = hWnd; } + WXHWND GetHWND() const { return m_hWnd; } + void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } + virtual WXWidget GetHandle() const { return GetHWND(); } bool GetUseCtl3D() const { return m_useCtl3D; } bool GetTransparentBackground() const { return m_backgroundTransparent; } @@ -340,6 +341,9 @@ public: } protected: + // the window handle + WXHWND m_hWnd; + // the old window proc (we subclass all windows) WXFARPROC m_oldWndProc; diff --git a/include/wx/window.h b/include/wx/window.h index 9fb6eb4e7d..e0779b8b16 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -595,27 +595,14 @@ public: void OnSysColourChanged( wxSysColourChangedEvent& event ); void OnInitDialog( wxInitDialogEvent &event ); -/* - // What is this doing in the platform independent part? - // No doc specifies this. Of what use would that be? - - // 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; } - -*/ + // get the haqndle of the window for the underlying window system: this + // is only used for wxWin itself or for user code which wants to call + // platform-specific APIs + virtual WXWidget GetHandle() const = 0; protected: // 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; // the parent window of this window (or NULL) and the list of the children