Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 4081781d874131206c31f139dc4b2ef002db3ee5..01115c15f335e2b79bf1bddf4d5a9eecf5a57864 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -14,7 +14,7 @@
 #ifndef _WX_UNIV_WINDOW_H_
 #define _WX_UNIV_WINDOW_H_
 
 #ifndef _WX_UNIV_WINDOW_H_
 #define _WX_UNIV_WINDOW_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univwindow.h"
 #endif
 
     #pragma interface "univwindow.h"
 #endif
 


@@ -27,30 +27,6 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxScrollBar;
 
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxScrollBar;
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// control state flags used in wxRenderer and wxColourScheme
-enum
-{
-    wxCONTROL_DISABLED   = 0x00000001,  // control is disabled
-    wxCONTROL_FOCUSED    = 0x00000002,  // currently has keyboard focus
-    wxCONTROL_PRESSED    = 0x00000004,  // (button) is pressed
-    wxCONTROL_ISDEFAULT  = 0x00000008,  // only applies to the buttons
-    wxCONTROL_ISSUBMENU  = wxCONTROL_ISDEFAULT, // only for menu items
-    wxCONTROL_CURRENT    = 0x00000010,  // mouse is currently over the control
-    wxCONTROL_SELECTED   = 0x00000020,  // selected item in e.g. listbox
-    wxCONTROL_CHECKED    = 0x00000040,  // (check/radio button) is checked
-    wxCONTROL_CHECKABLE  = 0x00000080,  // (menu) item can be checked
-
-    wxCONTROL_FLAGS_MASK = 0x000000ff,
-
-    // this is a pseudo flag not used directly by wxRenderer but rather by some
-    // controls internally
-    wxCONTROL_DIRTY      = 0x80000000
-};
-

 #ifdef __WXX11__
 #define wxUSE_TWO_WINDOWS 1
 #else
 #ifdef __WXX11__
 #define wxUSE_TWO_WINDOWS 1
 #else


@@ -166,11 +142,6 @@ public:
     // controls only
     virtual bool IsCanvasWindow() const { return FALSE; }
 
     // controls only
     virtual bool IsCanvasWindow() const { return FALSE; }
 

-    // return TRUE if this a container window which contains the other items:
-    // e.g, a listbox, listctrl, treectrl, ... and FALSE if it is a monolithic
-    // control (e.g. a button, checkbox, ...)
-    virtual bool IsContainerWindow() 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
     // returns TRUE if the control has "transparent" areas such
     // as a wxStaticText and wxCheckBox and the background should
     // be adapted from a parent window