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 8a53c0b34e886ad0fab127ed2878647d065833e2..d3a845d84ad680d96788507aa330dd5b416cd8b1 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -51,6 +51,12 @@ enum
     wxCONTROL_DIRTY      = 0x80000000
 };
 
     wxCONTROL_DIRTY      = 0x80000000
 };
 

+#ifdef __WXX11__
+#define wxUSE_TWO_WINDOWS 1
+#else
+#define wxUSE_TWO_WINDOWS 0
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWindow
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWindow
 // ----------------------------------------------------------------------------


@@ -194,6 +200,9 @@ public:
 
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);
 
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);

+    
+    // see below
+    bool HasDialogBackground() { return m_hasDialogBackground; }

 
     // overridden base class methods
     // -----------------------------
 
     // overridden base class methods
     // -----------------------------


@@ -260,11 +269,18 @@ protected:
 
     // the renderer we use
     wxRenderer *m_renderer;
 
     // 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;
 
     // 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;
 
     // is the mouse currently inside the window?
     bool m_isCurrent:1;