Removed this Maximize() overridden bug
Changed wxFrame so that drawing into the client area draws into the client area. Removed some ugly hacks on the way. Don't forget to recompile everything. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -103,7 +103,6 @@ public:
|
||||
// implementation
|
||||
|
||||
virtual void GtkOnSize( int x, int y, int width, int height );
|
||||
virtual wxPoint GetClientAreaOrigin() const;
|
||||
void DoMenuUpdates();
|
||||
void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
|
||||
virtual void OnInternalIdle();
|
||||
@@ -115,6 +114,7 @@ public:
|
||||
wxString m_title;
|
||||
wxIcon m_icon;
|
||||
int m_miniEdge,m_miniTitle;
|
||||
GtkWidget *m_mainWidget;
|
||||
|
||||
protected:
|
||||
virtual void DoSetSize(int x, int y,
|
||||
|
@@ -150,7 +150,7 @@ class wxMDIChildFrame: public wxFrame
|
||||
wxString GetTitle() const { return m_title; }
|
||||
|
||||
// no maximize etc
|
||||
virtual void Maximize(void) {}
|
||||
virtual void Maximize(bool WXUNUSED(maximize)) {}
|
||||
virtual void Restore(void) {}
|
||||
|
||||
void OnActivate( wxActivateEvent &event );
|
||||
|
@@ -403,14 +403,12 @@ public:
|
||||
|
||||
// implementation
|
||||
|
||||
virtual wxPoint GetClientAreaOrigin() const;
|
||||
virtual void AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
|
||||
|
||||
bool HasVMT();
|
||||
|
||||
/* I don't want users to override what's done in OnIdle */
|
||||
virtual void OnInternalIdle();
|
||||
|
||||
// For compatibility across platforms (not in event table)
|
||||
/* For compatibility across platforms (not in event table) */
|
||||
void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
|
||||
|
||||
/* used by all classes in the widget creation process */
|
||||
|
Reference in New Issue
Block a user