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

Weekly update

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-08-30 21:20:42 +00:00
parent ee7908dbe9
commit 018d3030cc
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/os2/button.h
View File

@@ -84,9 +84,9 @@ protected:
void SetTmpDefault(void); void SetTmpDefault(void);
void UnsetTmpDefault(void); void UnsetTmpDefault(void);
static void UpdateDefaultStyle( wxWindow* pWinDefault static void SetDefaultStyle( wxButton* pButton
,wxWindow* pWinOldDefault ,bool bOn
); );
virtual wxSize DoGetBestSize(void) const; virtual wxSize DoGetBestSize(void) const;
virtual WXDWORD OS2GetStyle( long style virtual WXDWORD OS2GetStyle( long style

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

@@ -125,6 +125,8 @@ public:
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; } void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips #endif // tooltips
virtual void SendSizeEvent(void);
void SetClient(WXHWND c_Hwnd); void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window); void SetClient(wxWindow* c_Window);
wxWindow *GetClient(); wxWindow *GetClient();

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

@@ -72,6 +72,9 @@ public:
virtual bool SetFont(const wxFont &rFont); virtual bool SetFont(const wxFont &rFont);
virtual void SetFocus(void); virtual void SetFocus(void);
inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); } inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); }
void SetSelection( long lFrom
,long lTo
);
virtual bool Show(bool bShow = TRUE); virtual bool Show(bool bShow = TRUE);

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

@@ -602,20 +602,21 @@ private:
,WXWPARAM wParam = 0 ,WXWPARAM wParam = 0
) const; ) const;
wxWindowList* m_pChildrenDisabled;
DECLARE_DYNAMIC_CLASS(wxWindowOS2);
DECLARE_NO_COPY_CLASS(wxWindowOS2)
DECLARE_EVENT_TABLE()
private:
HWND m_hWndScrollBarHorz; HWND m_hWndScrollBarHorz;
HWND m_hWndScrollBarVert; HWND m_hWndScrollBarVert;
SWP m_vWinSwp; SWP m_vWinSwp;
bool m_bIsActivePage; bool m_bIsActivePage;
DECLARE_DYNAMIC_CLASS(wxWindowOS2);
DECLARE_NO_COPY_CLASS(wxWindowOS2)
DECLARE_EVENT_TABLE()
//
// Virtual function hiding supression // Virtual function hiding supression
//
inline virtual bool Reparent(wxWindowBase* pNewParent) inline virtual bool Reparent(wxWindowBase* pNewParent)
{ return(wxWindowBase::Reparent(pNewParent));}; { return(wxWindowBase::Reparent(pNewParent));}
}; // end of wxWindow }; // end of wxWindow
class wxWindowCreationHook class wxWindowCreationHook