declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 723a4a8ab56866680c9ba25b0c8adafc9ef62e93..7a48f97ffdd0c2269671512e2ab97fc07c9465e6 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -11,7 +11,7 @@
 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 
 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 

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

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -177,6 +177,12 @@ public:
                                  wxCoord& WXUNUSED(x),
                                  wxCoord& WXUNUSED(y)) { }
 
                                  wxCoord& WXUNUSED(x),
                                  wxCoord& WXUNUSED(y)) { }
 

+    // is this window transparent for the mouse events (as wxStaticBox is)?
+    virtual bool IsTransparentForMouse() const { return FALSE; }
+
+    // is this a radiobutton (used by radiobutton code itself only)?
+    virtual bool IsRadioButton() const { return FALSE; }
+

     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;
     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;


@@ -195,8 +201,11 @@ public:
     GdkICAttr           *m_icattr;
 #endif
 
     GdkICAttr           *m_icattr;
 #endif
 

+#ifndef __WXGTK20__

     // The area to be cleared (and not just refreshed)
     // The area to be cleared (and not just refreshed)

+    // We cannot make this distinction under GTK 2.0.

     wxRegion             m_clearRegion;
     wxRegion             m_clearRegion;

+#endif

 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;


@@ -211,10 +220,6 @@ public:
     bool                 m_hasVMT:1;
     bool                 m_sizeSet:1;
     bool                 m_resizing:1;
     bool                 m_hasVMT:1;
     bool                 m_sizeSet:1;
     bool                 m_resizing:1;

-    bool                 m_isStaticBox:1;       // faster than IS_KIND_OF
-    bool                 m_isRadioButton:1;     // faster than IS_KIND_OF
-    bool                 m_isListBox:1;         // faster than IS_KIND_OF
-    bool                 m_isFrame:1;           // faster than IS_KIND_OF

     bool                 m_acceptsFocus:1;      // true if not static
     bool                 m_hasFocus:1;          // true if == FindFocus()
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?
     bool                 m_acceptsFocus:1;      // true if not static
     bool                 m_hasFocus:1;          // true if == FindFocus()
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?