projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. EVT_GRID_XXX constants renamed to wxEVT_GRID_XXX
[wxWidgets.git]
/
include
/
wx
/
mac
/
window.h
diff --git
a/include/wx/mac/window.h
b/include/wx/mac/window.h
index 3eac7270ce0774da4c916d133643780565a4908e..ba8b50315f183f1d4ba1b95b9a4821e1e8345d5f 100644
(file)
--- a/
include/wx/mac/window.h
+++ b/
include/wx/mac/window.h
@@
-86,7
+86,6
@@
public:
virtual void SetFocus();
virtual void SetFocus();
- virtual bool Reparent( wxWindow *newParent );
virtual void WarpPointer(int x, int y);
virtual void CaptureMouse();
virtual void WarpPointer(int x, int y);
virtual void CaptureMouse();
@@
-181,6
+180,8
@@
public:
void OnEraseBackground(wxEraseEvent& event);
void OnIdle(wxIdleEvent& event);
void MacOnScroll(wxScrollEvent&event ) ;
void OnEraseBackground(wxEraseEvent& event);
void OnIdle(wxIdleEvent& event);
void MacOnScroll(wxScrollEvent&event ) ;
+
+ bool AcceptsFocus() const ;
public:
// For implementation purposes - sometimes decorations make the client area
public:
// For implementation purposes - sometimes decorations make the client area
@@
-235,10
+236,12
@@
public :
virtual void MacFireMouseEvent( EventRecord *ev ) ;
virtual bool MacDispatchMouseEvent(wxMouseEvent& event ) ;
virtual void MacEraseBackground( Rect *rect ) ;
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() ;
WindowRef GetMacRootWindow() const ;
virtual ControlHandle MacGetContainerForEmbedding() ;
virtual void MacSuperChangedPosition() ;
+ virtual void MacSuperShown( bool show ) ;
bool MacSetupFocusPort() ;
bool MacSetupDrawingPort() ;
bool MacSetupFocusPort() ;
bool MacSetupDrawingPort() ;
@@
-297,10
+300,6
@@
protected:
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height);
- // get the size which best suits the window: e.g., for a static text it
- // will be the width and height of the text
- virtual wxSize DoGetBestSize();
-
// move the window to the specified location and resize it: this is called
// from both DoSetSize() and DoSetClientSize() and would usually just call
// ::MoveWindow() except for composite controls which will want to arrange
// move the window to the specified location and resize it: this is called
// from both DoSetSize() and DoSetClientSize() and would usually just call
// ::MoveWindow() except for composite controls which will want to arrange