compilation fixes (I wonder how did you people ever compile it...)

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 84de58e5ff46da2ae0188576d00bc9d75a21beb2..ce6b0332d4226c3137102f77969d91d3fa8669b8 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        window.h
+// Name:        wx/gtk/window.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -19,36 +19,36 @@
 // callback definition for inserting a window (internal)
 //-----------------------------------------------------------------------------
 
 // callback definition for inserting a window (internal)
 //-----------------------------------------------------------------------------
 

-typedef void (*wxInsertChildFunction)( wxWindow*, wxWindow* );
+class wxWindowGTK;
+typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* );

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxWindow
+// wxWindowGTK

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxWindow : public wxWindowBase
+class wxWindowGTK : public wxWindowBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxWindow)
-

 public:
     // creating the window
     // -------------------
 public:
     // creating the window
     // -------------------

-    wxWindow();
-    wxWindow(wxWindow *parent,
-             wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxString& name = wxPanelNameStr);
+    wxWindowGTK();
+    wxWindowGTK(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxPanelNameStr);

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPanelNameStr);

-    virtual ~wxWindow();
+    virtual ~wxWindowGTK();

 
     // implement base class (pure) virtual methods
     // -------------------------------------------
 
     // implement base class (pure) virtual methods
     // -------------------------------------------

+

     virtual bool Destroy();
 
     virtual void Raise();
     virtual bool Destroy();
 
     virtual void Raise();


@@ -62,7 +62,7 @@ public:
     virtual void SetFocus();
     virtual bool AcceptsFocus() const;
 
     virtual void SetFocus();
     virtual bool AcceptsFocus() const;
 

-    virtual bool Reparent( wxWindow *newParent );
+    virtual bool Reparent( wxWindowBase *newParent );

 
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();
 
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();


@@ -86,10 +86,9 @@ public:
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 

-    virtual void ClientToScreen( int *x, int *y ) const;
-    virtual void ScreenToClient( int *x, int *y ) const;
-
-    virtual bool PopupMenu( wxMenu *menu, int x, int y );
+#if wxUSE_MENUS_NATIVE
+    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+#endif // wxUSE_MENUS_NATIVE

 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );


@@ -109,15 +108,6 @@ public:
 
     virtual WXWidget GetHandle() const { return m_widget; }
 
 
     virtual WXWidget GetHandle() const { return m_widget; }
 

-    // wxWindows callbacks
-    void OnKeyDown( wxKeyEvent &event );
-
-    // also sets the global flag
-    void SetScrolling(bool scroll);
-
-    bool HasScrolling() const { return m_hasScrolling; }
-    bool IsScrolling() const { return m_isScrolling; }
-

     /* I don't want users to override what's done in idle so everything that
        has to be done in idle time in order for wxGTK to work is done in
        OnInternalIdle */
     /* I don't want users to override what's done in idle so everything that
        has to be done in idle time in order for wxGTK to work is done in
        OnInternalIdle */


@@ -126,13 +116,19 @@ public:
     /* For compatibility across platforms (not in event table) */
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
 
     /* For compatibility across platforms (not in event table) */
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
 

-    /* used by all classes in the widget creation process */
-    void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
-            const wxSize &size, long style, const wxString &name );
+    // wxGTK-specific: called recursively by Enable,
+    // to give widgets an oppprtunity to correct their colours after they
+    // have been changed by Enable
+    virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
+
+    /* used by all window classes in the widget creation process */
+    bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );

     void PostCreation();
 
     void PostCreation();
 

-    void InsertChild(wxWindow *child) { (*m_insertCallback)(this, child); }
-    void DoAddChild(wxWindow *child) { AddChild(child); InsertChild(child); }
+    /* internal addition of child windows. differs from class
+       to class not by using virtual functions but by using
+       the m_insertCallback */
+    void DoAddChild(wxWindowGTK *child);

 
     /* the methods below are required because many native widgets
        are composed of several subwidgets and setting a style for
 
     /* the methods below are required because many native widgets
        are composed of several subwidgets and setting a style for


@@ -145,14 +141,14 @@ public:
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 

-    // creates a new widget style if none is there
-    // and sets m_widgetStyle to this value.
+    /* creates a new widget style if none is there
+       and sets m_widgetStyle to this value. */

     GtkStyle *GetWidgetStyle();
     GtkStyle *GetWidgetStyle();

-    
-    // called by SetFont() and SetXXXColour etc
+
+    /* called by SetFont() and SetXXXColour etc */

     void SetWidgetStyle();
     void SetWidgetStyle();

-    
-    // overridden in many GTK widgets
+
+    /* overridden in many GTK widgets */

     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS


@@ -162,45 +158,53 @@ public:
     // called from GTK signales handlers. it indicates that
     // the layouting functions have to be called later on
     // (i.e. in idle time, implemented in OnInternalIdle() ).
     // called from GTK signales handlers. it indicates that
     // the layouting functions have to be called later on
     // (i.e. in idle time, implemented in OnInternalIdle() ).

-    void UpdateSize() { m_sizeSet = FALSE; }
-
+    void GtkUpdateSize() { m_sizeSet = 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;

+    int                  m_oldClientWidth,m_oldClientHeight;

 
     // see the docs in src/gtk/window.cpp
 
     // see the docs in src/gtk/window.cpp

-    GtkWidget           *m_widget;
-    GtkWidget           *m_wxwindow;
+    GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
+    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWindows
+    
+    // this widget will be queried for GTK's focus events
+    GtkWidget           *m_focusWidget;
+
+#if HAVE_XIM
+    // XIM support for wxWindows
+    GdkIC               *m_ic;
+    GdkICAttr           *m_icattr;
+#endif

 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;
 
 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;
 

-    // we need an extra XGC flag set to get exposed
-    // events from overlapping children upon moving
-    // them. this flag will be set in this GC and
-    // the GC will be used in wxWindow::ScrollWindow().
-    GdkGC               *m_scrollGC;
-

     // extra (wxGTK-specific) flags
     // extra (wxGTK-specific) flags

-    bool                 m_needParent:1;    /* ! wxFrame, wxDialog, wxNotebookPage ?  */
+    bool                 m_needParent:1;        // ! wxFrame, wxDialog, wxNotebookPage ?
+    bool                 m_noExpose:1;          // wxGLCanvas has its own redrawing
+    bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"

     bool                 m_hasScrolling:1;
     bool                 m_hasScrolling:1;

-    bool                 m_isScrolling:1;

     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_isFrame:1;       /* faster than IS_KIND_OF */
-    bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */
-    
+    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;      // not wxStaticBox, not wxStaticBitmap etc.
+    bool                 m_isScrolling;
+    bool                 m_clipPaintRegion;     // TRUE after ScrollWindow()
+    bool                 m_queuedFullRedraw;    // TRUE after DoMoveWindow
+

     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"
     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"

-    bool                 m_delayedFont:1;

     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;

-    bool                 m_delayedCursor:1;

 
     // contains GTK's widgets internal information about non-default widget
     // font and colours. we create one for each widget that gets any
 
     // contains GTK's widgets internal information about non-default widget
     // font and colours. we create one for each widget that gets any


@@ -214,6 +218,8 @@ public:
     wxInsertChildFunction  m_insertCallback;
 
     // implement the base class pure virtuals
     wxInsertChildFunction  m_insertCallback;
 
     // implement the base class pure virtuals

+    virtual void DoClientToScreen( int *x, int *y ) const;
+    virtual void DoScreenToClient( int *x, int *y ) const;

     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetClientSize( int *width, int *height ) const;
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetClientSize( int *width, int *height ) const;


@@ -221,6 +227,7 @@ public:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);

+    virtual void DoMoveWindow(int x, int y, int width, int height);

 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );


@@ -230,7 +237,10 @@ public:
     void Init();
 
 private:
     void Init();
 
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
+    DECLARE_NO_COPY_CLASS(wxWindowGTK)

 };
 
 };
 

+extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);
+

 #endif // __GTKWINDOWH__
 #endif // __GTKWINDOWH__