make GTKNeedsParent() private

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 7732a9ab842443e984a3dde3fe54a80d7357ad65..c2841074ef870a7205cdf70a7ff7b117f178c440 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -41,10 +41,6 @@ public:
     void SetLayoutDirection(wxLayoutDirection dir);
     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 Detach();
 
@@ -54,6 +50,10 @@ private:
 
     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;
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 4e4185787bfdd7f92b43bf6e17386bd420f7aa36..decd337ac02c0e51c852247530b6c7fae2701677 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -184,11 +184,6 @@ public:
     static wxLayoutDirection GTKGetLayout(GtkWidget *widget);
     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
     // fire off capture lost events.
     void GTKReleaseMouseAndNotify();
@@ -404,6 +399,11 @@ protected:
 private:
     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 };
 
     // common part of ScrollLines() and ScrollPages() and could be used, in the