Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make GTKNeedsParent() private

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-12-29 06:29:52 +00:00
parent f1a3ae7dc9
commit bf487502d9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/menu.h
View File

@@ -41,10 +41,6 @@ public:
void SetLayoutDirection(wxLayoutDirection dir); void SetLayoutDirection(wxLayoutDirection dir);
wxLayoutDirection GetLayoutDirection() const; wxLayoutDirection GetLayoutDirection() const;
// wxMenuBar is not a top level window but it still doesn't need a parent
// window
virtual bool GTKNeedsParent() const { return false; }
virtual void Attach(wxFrame *frame); virtual void Attach(wxFrame *frame);
virtual void Detach(); virtual void Detach();
@@ -54,6 +50,10 @@ private:
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
// wxMenuBar is not a top level window but it still doesn't need a parent
// window
virtual bool GTKNeedsParent() const { return false; }
GtkWidget* m_menubar; GtkWidget* m_menubar;
DECLARE_DYNAMIC_CLASS(wxMenuBar) DECLARE_DYNAMIC_CLASS(wxMenuBar)

10
include/wx/gtk/window.h
View File

@@ -184,11 +184,6 @@ public:
static wxLayoutDirection GTKGetLayout(GtkWidget *widget); static wxLayoutDirection GTKGetLayout(GtkWidget *widget);
static void GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir); static void GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir);
// return true if this window must have a non-NULL parent, false if it can
// be created without parent (normally only top level windows but in wxGTK
// there is also the exception of wxMenuBar)
virtual bool GTKNeedsParent() const { return !IsTopLevel(); }
// This is called when capture is taken from the window. It will // This is called when capture is taken from the window. It will
// fire off capture lost events. // fire off capture lost events.
void GTKReleaseMouseAndNotify(); void GTKReleaseMouseAndNotify();
@@ -404,6 +399,11 @@ protected:
private: private:
void Init(); void Init();
// return true if this window must have a non-NULL parent, false if it can
// be created without parent (normally only top level windows but in wxGTK
// there is also the exception of wxMenuBar)
virtual bool GTKNeedsParent() const { return !IsTopLevel(); }
enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max }; enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
// common part of ScrollLines() and ScrollPages() and could be used, in the // common part of ScrollLines() and ScrollPages() and could be used, in the