Updates to fix statusbar and menu errors.

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 187c9e34cb74796daeee7454e6bd2dbcba2bfc86..e648eb9815cd2b1cc7d0e8817f5f4292178c8b6f 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();


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

+#if wxUSE_MENUS_NATIVE

     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
     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 );


@@ -120,13 +122,13 @@ public:
     virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
 
     /* used by all window classes in the widget creation process */
     virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
 
     /* used by all window classes in the widget creation process */

-    bool PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size );
+    bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );

     void PostCreation();
 
     /* internal addition of child windows. differs from class
        to class not by using virtual functions but by using
        the m_insertCallback */
     void PostCreation();
 
     /* internal addition of child windows. differs from class
        to class not by using virtual functions but by using
        the m_insertCallback */

-    void DoAddChild(wxWindow *child);
+    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


@@ -172,7 +174,7 @@ public:
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif

-    
+

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


@@ -199,7 +201,7 @@ public:
     // before the widget has been "realized"
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
     // before the widget has been "realized"
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;

-    
+

     // contains GTK's widgets internal information about non-default widget
     // font and colours. we create one for each widget that gets any
     // non-default attribute set via SetFont() or SetForegroundColour() /
     // contains GTK's widgets internal information about non-default widget
     // font and colours. we create one for each widget that gets any
     // non-default attribute set via SetFont() or SetForegroundColour() /


@@ -231,7 +233,10 @@ public:
     void Init();
 
 private:
     void Init();
 
 private:

-    DECLARE_NO_COPY_CLASS(wxWindow);
+    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
+    DECLARE_NO_COPY_CLASS(wxWindowGTK)

 };
 
 };
 

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

 #endif // __GTKWINDOWH__
 #endif // __GTKWINDOWH__