wxLaunchDefaultBrowser() now supports wxBROWSER_NEW_WINDOW flag (and it actually...

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 3761d2e79d3b51e98477636637223a07736b9cf2..622c0a324bd3cea654e8bf71bdf15454ad728fa3 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;
@@ -73,6 +69,8 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
+    virtual ~wxWindow();
+
     // background pixmap support
     // -------------------------
 
@@ -142,23 +140,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; }
-    
-    // to be used with function above: transparent windows get
-    // their background from parents that return true here,
-    // so this is mostly for wxPanel, wxTopLevelWindow etc.
-    virtual bool ProvidesBackground() const { 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; }
 
@@ -181,7 +168,7 @@ public:
 
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);
-    
+
     // overridden base class methods
     // -----------------------------
 
@@ -250,12 +237,12 @@ protected:
 
     // the renderer we use
     wxRenderer *m_renderer;
-    
+
     // background bitmap info
     wxBitmap  m_bitmapBg;
     int       m_alignBgBitmap;
     wxStretch m_stretchBgBitmap;
-    
+
     // old size
     wxSize m_oldSize;
 
@@ -263,8 +250,13 @@ protected:
     bool m_isCurrent:1;
 
 #ifdef __WXMSW__
+
+#if wxABI_VERSION >= 20602
+public:
+#endif
     // override MSWWindowProc() to process WM_NCHITTEST
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
 #endif // __WXMSW__
 
 private: