*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d22699b5eb
commit
849949b13f
@ -195,7 +195,7 @@ public:
|
|||||||
// title; for items, this is the label or button text.
|
// title; for items, this is the label or button text.
|
||||||
inline virtual wxString GetLabel() const { return GetTitle(); }
|
inline virtual wxString GetLabel() const { return GetTitle(); }
|
||||||
|
|
||||||
|
#if wxUSE_CARET && WXWIN_COMPATIBILITY
|
||||||
// Caret manipulation
|
// Caret manipulation
|
||||||
virtual void CreateCaret(int w, int h);
|
virtual void CreateCaret(int w, int h);
|
||||||
virtual void CreateCaret(const wxBitmap *bitmap);
|
virtual void CreateCaret(const wxBitmap *bitmap);
|
||||||
@ -203,7 +203,7 @@ public:
|
|||||||
virtual void ShowCaret(bool show);
|
virtual void ShowCaret(bool show);
|
||||||
virtual void SetCaretPos(int x, int y);
|
virtual void SetCaretPos(int x, int y);
|
||||||
virtual void GetCaretPos(int *x, int *y) const;
|
virtual void GetCaretPos(int *x, int *y) const;
|
||||||
|
#endif
|
||||||
|
|
||||||
// Handle a control command
|
// Handle a control command
|
||||||
virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
|
virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
|
||||||
@ -267,10 +267,24 @@ protected:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
int m_returnCode;
|
int m_returnCode;
|
||||||
|
bool m_isBeingDeleted;
|
||||||
|
bool m_isShown;
|
||||||
|
bool m_winCaptured;
|
||||||
|
bool m_mouseInWindow;
|
||||||
|
bool m_backgroundTransparent;
|
||||||
|
// handles
|
||||||
|
WXHWND m_hWnd;
|
||||||
|
WXHMENU m_hMenu; // Menu, if any
|
||||||
|
|
||||||
|
// the size of one page for scrolling
|
||||||
|
int m_xThumbSize;
|
||||||
|
int m_yThumbSize;
|
||||||
|
long m_lDlgCode;
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
private:
|
private:
|
||||||
void Init();
|
void Init();
|
||||||
|
void PMDetachWindowMenu();
|
||||||
};
|
};
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
|
1661
src/os2/window.cpp
1661
src/os2/window.cpp
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user