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

Various OS/2 changes to keep up with general library changes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-18 16:57:12 +00:00
parent 60e2e6c0ff
commit 289b295104
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,8 @@ public:
// just return a new class) // just return a new class)
virtual wxMDIClientWindow *OnCreateClient(void); virtual wxMDIClientWindow *OnCreateClient(void);
WXHMENU GetWindowMenu() const { return m_windowMenu; } wxMenu* GetWindowMenu() const { return m_windowMenu; }
// void SetWindowMenu(wxMwnu* pMenu);
// MDI operations // MDI operations
// -------------- // --------------
@@ -93,7 +94,7 @@ protected:
wxMDIClientWindow * m_clientWindow; wxMDIClientWindow * m_clientWindow;
wxMDIChildFrame * m_currentChild; wxMDIChildFrame * m_currentChild;
WXHMENU m_windowMenu; wxMenu* m_windowMenu;
// TRUE if MDI Frame is intercepting commands, not child // TRUE if MDI Frame is intercepting commands, not child
bool m_parentFrameActive; bool m_parentFrameActive;

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

@@ -17,7 +17,7 @@
class WXDLLEXPORT wxRadioButton: public wxControl class WXDLLEXPORT wxRadioButton: public wxControl
{ {
public: public:
inline wxRadioButton() {} inline wxRadioButton() { Init(); }
inline wxRadioButton( wxWindow* pParent inline wxRadioButton( wxWindow* pParent
,wxWindowID vId ,wxWindowID vId
,const wxString& rsLabel ,const wxString& rsLabel
@@ -30,6 +30,8 @@ public:
,const wxString& rsName = wxRadioButtonNameStr ,const wxString& rsName = wxRadioButtonNameStr
) )
{ {
Init();
Create( pParent Create( pParent
,vId ,vId
,rsLabel ,rsLabel
@@ -54,15 +56,24 @@ public:
#endif #endif
,const wxString& rsName = wxRadioButtonNameStr ,const wxString& rsName = wxRadioButtonNameStr
); );
virtual void SetLabel(const wxString& rsLabel); virtual void SetLabel(const wxString& rsLabel);
virtual void SetValue(bool bVal); virtual void SetValue(bool bVal);
virtual bool GetValue(void) const ; virtual bool GetValue(void) const ;
bool OS2Command( WXUINT wParam bool OS2Command( WXUINT wParam
,WXWORD wId ,WXWORD wId
); );
void Command(wxCommandEvent& rEvent); void Command(wxCommandEvent& rEvent);
virtual void SetFocus(void);
protected:
virtual wxSize DoGetBestSize() const;
private: private:
void Init(void);
bool m_bFocusJustSet;
DECLARE_DYNAMIC_CLASS(wxRadioButton) DECLARE_DYNAMIC_CLASS(wxRadioButton)
}; // end of wxRadioButton }; // end of wxRadioButton

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

@@ -426,9 +426,6 @@ public:
virtual bool OS2TranslateMessage(WXMSG* pMsg); virtual bool OS2TranslateMessage(WXMSG* pMsg);
virtual void OS2DestroyWindow(void); virtual void OS2DestroyWindow(void);
// Detach "Window" menu from menu bar so it doesn't get deleted
void OS2DetachWindowMenu(void);
// this function should return the brush to paint the window background // this function should return the brush to paint the window background
// with or 0 for the default brush // with or 0 for the default brush
virtual WXHBRUSH OnCtlColor( WXHDC hDC virtual WXHBRUSH OnCtlColor( WXHDC hDC