SWIGged updates for wxGTK

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index c32af380e28ca6311367ffdb1744a1a141848e3f..d3a845d84ad680d96788507aa330dd5b416cd8b1 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -51,6 +51,12 @@ enum
     wxCONTROL_DIRTY      = 0x80000000
 };
 
+#ifdef __WXX11__
+#define wxUSE_TWO_WINDOWS 1
+#else
+#define wxUSE_TWO_WINDOWS 0
+#endif
+
 // ----------------------------------------------------------------------------
 // wxWindow
 // ----------------------------------------------------------------------------
@@ -61,6 +67,8 @@ enum
 #define wxWindowNative wxWindowGTK
 #elif defined(__WXMGL__)
 #define wxWindowNative wxWindowMGL
+#elif defined(__WXX11__)
+#define wxWindowNative wxWindowX11
 #elif defined(__WXMAC__)
 #define wxWindowNative wxWindowMac
 #endif
@@ -173,6 +181,10 @@ public:
     bool UseFgCol() const { return m_hasFgCol; }
     bool UseFont() const { return m_hasFont; }
 
+    // return TRUE if this window serves as a container for the other windows
+    // only and doesn't get any input itself
+    virtual bool IsStaticBox() const { return FALSE; }
+
     // returns the (low level) renderer to use for drawing the control by
     // querying the current theme
     wxRenderer *GetRenderer() const { return m_renderer; }
@@ -188,6 +200,9 @@ public:
 
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);
+    
+    // see below
+    bool HasDialogBackground() { return m_hasDialogBackground; }
 
     // overridden base class methods
     // -----------------------------
@@ -254,15 +269,27 @@ protected:
 
     // the renderer we use
     wxRenderer *m_renderer;
+    
+    // background like a dialog (e.g. wxStaticText,
+    // wxRadioButton), not with a surface (wxButton)
+    bool m_hasDialogBackground;
 
     // background bitmap info
     wxBitmap  m_bitmapBg;
     int       m_alignBgBitmap;
     wxStretch m_stretchBgBitmap;
+    
+    // old size
+    wxSize m_oldSize;
 
     // is the mouse currently inside the window?
     bool m_isCurrent:1;
 
+#ifdef __WXMSW__
+    // override MSWWindowProc() to process WM_NCHITTEST
+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+#endif // __WXMSW__
+
 private:
     // the window scrollbars
     wxScrollBar *m_scrollbarHorz,