mac updates and msw bitmapdrawing on printer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -382,6 +382,7 @@ class WXDLLEXPORT wxDC: public wxObject
|
||||
|
||||
//begin wxmac
|
||||
GrafPtr m_macPort ;
|
||||
GWorldPtr m_macMask ;
|
||||
|
||||
// in order to preserve the const inheritance of the virtual functions, we have to
|
||||
// use mutable variables starting from CWPro 5
|
||||
|
@@ -111,6 +111,7 @@ public:
|
||||
// --------------
|
||||
|
||||
bool IsModalShowing() const { return m_modalShowing; }
|
||||
virtual bool IsTopLevel() const { return TRUE; }
|
||||
|
||||
// tooltip management
|
||||
#if wxUSE_TOOLTIPS
|
||||
|
@@ -56,6 +56,7 @@ public:
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual bool Destroy();
|
||||
virtual bool IsTopLevel() const { return TRUE; }
|
||||
|
||||
void OnSize(wxSizeEvent& event);
|
||||
void OnMenuHighlight(wxMenuEvent& event);
|
||||
|
@@ -49,6 +49,13 @@ class WXDLLEXPORT wxStaticText: public wxControl
|
||||
// operations
|
||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
|
||||
// events
|
||||
void OnPaint( wxPaintEvent &event ) ;
|
||||
wxSize DoGetBestSize() const ;
|
||||
private :
|
||||
wxString m_label ;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -236,10 +236,12 @@ public :
|
||||
virtual void MacFireMouseEvent( EventRecord *ev ) ;
|
||||
virtual bool MacDispatchMouseEvent(wxMouseEvent& event ) ;
|
||||
virtual void MacEraseBackground( Rect *rect ) ;
|
||||
virtual void MacPaint( wxPaintEvent &event ) ;
|
||||
WindowRef GetMacRootWindow() const ;
|
||||
|
||||
virtual ControlHandle MacGetContainerForEmbedding() ;
|
||||
virtual void MacSuperChangedPosition() ;
|
||||
virtual void MacSuperShown( bool show ) ;
|
||||
|
||||
bool MacSetupFocusPort() ;
|
||||
bool MacSetupDrawingPort() ;
|
||||
|
Reference in New Issue
Block a user