Various OS/2 changes to keep up with general library changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
60e2e6c0ff
commit
289b295104
@ -61,7 +61,8 @@ public:
|
||||
// just return a new class)
|
||||
virtual wxMDIClientWindow *OnCreateClient(void);
|
||||
|
||||
WXHMENU GetWindowMenu() const { return m_windowMenu; }
|
||||
wxMenu* GetWindowMenu() const { return m_windowMenu; }
|
||||
// void SetWindowMenu(wxMwnu* pMenu);
|
||||
|
||||
// MDI operations
|
||||
// --------------
|
||||
@ -93,7 +94,7 @@ protected:
|
||||
|
||||
wxMDIClientWindow * m_clientWindow;
|
||||
wxMDIChildFrame * m_currentChild;
|
||||
WXHMENU m_windowMenu;
|
||||
wxMenu* m_windowMenu;
|
||||
|
||||
// TRUE if MDI Frame is intercepting commands, not child
|
||||
bool m_parentFrameActive;
|
||||
|
@ -17,7 +17,7 @@
|
||||
class WXDLLEXPORT wxRadioButton: public wxControl
|
||||
{
|
||||
public:
|
||||
inline wxRadioButton() {}
|
||||
inline wxRadioButton() { Init(); }
|
||||
inline wxRadioButton( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxString& rsLabel
|
||||
@ -30,6 +30,8 @@ public:
|
||||
,const wxString& rsName = wxRadioButtonNameStr
|
||||
)
|
||||
{
|
||||
Init();
|
||||
|
||||
Create( pParent
|
||||
,vId
|
||||
,rsLabel
|
||||
@ -54,15 +56,24 @@ public:
|
||||
#endif
|
||||
,const wxString& rsName = wxRadioButtonNameStr
|
||||
);
|
||||
|
||||
virtual void SetLabel(const wxString& rsLabel);
|
||||
virtual void SetValue(bool bVal);
|
||||
virtual bool GetValue(void) const ;
|
||||
|
||||
bool OS2Command( WXUINT wParam
|
||||
,WXWORD wId
|
||||
);
|
||||
void Command(wxCommandEvent& rEvent);
|
||||
bool OS2Command( WXUINT wParam
|
||||
,WXWORD wId
|
||||
);
|
||||
void Command(wxCommandEvent& rEvent);
|
||||
virtual void SetFocus(void);
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
private:
|
||||
void Init(void);
|
||||
|
||||
bool m_bFocusJustSet;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioButton)
|
||||
}; // end of wxRadioButton
|
||||
|
||||
|
@ -426,9 +426,6 @@ public:
|
||||
virtual bool OS2TranslateMessage(WXMSG* pMsg);
|
||||
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
|
||||
// with or 0 for the default brush
|
||||
virtual WXHBRUSH OnCtlColor( WXHDC hDC
|
||||
|
Loading…
Reference in New Issue
Block a user