correct access for virtuals

[wxWidgets.git] / include / wx / univ / window.h

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 2ef6b3ea943d927770a5bd780685179210378c76..65f24a80003b97990b6aca76f60195aa6bf894d6 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -14,10 +14,6 @@
 #ifndef _WX_UNIV_WINDOW_H_
 #define _WX_UNIV_WINDOW_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univwindow.h"
-#endif
-
 #include "wx/bitmap.h"      // for m_bitmapBg
 
 class WXDLLEXPORT wxControlRenderer;
@@ -110,8 +106,6 @@ public:
     // NB: all menu related functions are implemented in menu.cpp
 
 #if wxUSE_MENUS
-    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
-
     // this is wxUniv-specific private method to be used only by wxMenu
     void DismissPopupMenu();
 #endif // wxUSE_MENUS
@@ -144,18 +138,12 @@ public:
     // controls only
     virtual bool IsCanvasWindow() const { return false; }
 
-    // returns true if the control has "transparent" areas such
-    // as a wxStaticText and wxCheckBox and the background should
-    // be adapted from a parent window
-    virtual bool HasTransparentBackground() { return false; }
-
     // return true if this control can be highlighted when the mouse is over
     // it (the theme decides itself whether it is really highlighted or not)
     virtual bool CanBeHighlighted() const { return false; }
 
     // return true if we should use the colours/fonts returned by the
     // corresponding GetXXX() methods instead of the default ones
-    bool UseBgCol() const { return m_hasBgCol; }
     bool UseFgCol() const { return m_hasFgCol; }
     bool UseFont() const { return m_hasFont; }
 
@@ -197,7 +185,9 @@ protected:
     // common part of all ctors
     void Init();
 
-    // overridden base class virtuals
+#if wxUSE_MENUS
+    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
+#endif // wxUSE_MENUS
 
     // we deal with the scrollbars in these functions
     virtual void DoSetClientSize(int width, int height);
@@ -260,6 +250,7 @@ protected:
     bool m_isCurrent:1;
 
 #ifdef __WXMSW__
+public:
     // override MSWWindowProc() to process WM_NCHITTEST
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 #endif // __WXMSW__
@@ -282,4 +273,3 @@ private:
 };
 
 #endif // _WX_UNIV_WINDOW_H_
-