Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 20c067a48cc4253862a1f4337378bb69f4e30ebb..a1fe81180e5a59517ec76d4fc6d6e0839fd7cbca 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -2,9 +2,8 @@
 // Name:        window.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        window.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -44,8 +43,15 @@ class wxSizer;
 class wxResourceTable;
 class wxItemResource;
 
 class wxResourceTable;
 class wxItemResource;
 

+class wxClientData;
+class wxVoidClientData;

 class wxWindow;
 class wxWindow;

-class wxCanvas;
+
+//-----------------------------------------------------------------------------
+// callback definition for inserting a window (internal)
+//-----------------------------------------------------------------------------
+
+typedef void (*wxInsertChildFunction)( wxWindow*, wxWindow* );

 
 //-----------------------------------------------------------------------------
 // global data
 
 //-----------------------------------------------------------------------------
 // global data


@@ -55,6 +61,33 @@ extern const char *wxPanelNameStr;
 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 
 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 

+//-----------------------------------------------------------------------------
+// wxClientData
+//-----------------------------------------------------------------------------
+
+class wxClientData
+{
+public:
+    wxClientData() { }
+    virtual ~wxClientData() { }
+};
+
+//-----------------------------------------------------------------------------
+// wxStringClientData
+//-----------------------------------------------------------------------------
+
+class wxStringClientData: public wxClientData
+{
+public:
+    wxStringClientData() { }
+    wxStringClientData( wxString &data ) { m_data = data; }
+    void SetData( wxString &data ) { m_data = data; }
+    wxString GetData() const { return m_data; }
+    
+private:
+    wxString  m_data;
+};
+

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


@@ -65,14 +98,11 @@ class wxWindow: public wxEvtHandler
   
 public:
   wxWindow();
   
 public:
   wxWindow();

-  inline wxWindow(wxWindow *parent, wxWindowID id,
+  wxWindow(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,

-           const wxString& name = wxPanelNameStr)
-  {
-      Create(parent, id, pos, size, style, name);
-  }
+           const wxString& name = wxPanelNameStr);

   bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
   bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -120,7 +150,7 @@ public:
   virtual void Enable( bool enable );
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   virtual void Enable( bool enable );
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }

-  inline bool Enabled(void) const { return IsEnabled(); }
+  inline bool Enabled() const { return IsEnabled(); }

   virtual void SetFocus();
   virtual bool OnClose();
 
   virtual void SetFocus();
   virtual bool OnClose();
 


@@ -131,7 +161,7 @@ public:
   int GetReturnCode();
   wxWindow *GetParent() const
     { return m_parent; }
   int GetReturnCode();
   wxWindow *GetParent() const
     { return m_parent; }

-  wxWindow *GetGrandParent(void) const
+  wxWindow *GetGrandParent() const

     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
   void SetParent( wxWindow *p )
     { m_parent = p; }
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
   void SetParent( wxWindow *p )
     { m_parent = p; }


@@ -144,6 +174,12 @@ public:
   virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
 
   virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
 

+  virtual void SetClientObject( wxClientData *data );
+  virtual wxClientData *GetClientObject();
+    
+  virtual void SetClientData( void *data );
+  virtual void *GetClientData();
+  

   virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
   virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
   
   virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
   virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
   


@@ -168,8 +204,8 @@ public:
   virtual wxColour GetForegroundColour() const;
   virtual void SetForegroundColour( const wxColour &colour );
 
   virtual wxColour GetForegroundColour() const;
   virtual void SetForegroundColour( const wxColour &colour );
 

-  virtual int GetCharHeight(void) const;
-  virtual int GetCharWidth(void) const;
+  virtual int GetCharHeight() const;
+  virtual int GetCharWidth() const;

   virtual void GetTextExtent( const wxString& string, int *x, int *y,
                              int *descent = (int *) NULL,
                              int *externalLeading = (int *) NULL,
   virtual void GetTextExtent( const wxString& string, int *x, int *y,
                              int *descent = (int *) NULL,
                              int *externalLeading = (int *) NULL,


@@ -177,15 +213,19 @@ public:
 
   virtual void SetFont( const wxFont &font );
   virtual wxFont *GetFont();
 
   virtual void SetFont( const wxFont &font );
   virtual wxFont *GetFont();

-  // For backward compatibility
+  
+    // For backward compatibility

   inline virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
   inline virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
   inline virtual wxFont *GetLabelFont() { return GetFont(); };
   inline virtual wxFont *GetButtonFont() { return GetFont(); };
   inline virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
   inline virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
   inline virtual wxFont *GetLabelFont() { return GetFont(); };
   inline virtual wxFont *GetButtonFont() { return GetFont(); };

+  

   virtual void SetWindowStyleFlag( long flag );
   virtual long GetWindowStyleFlag() const;
   virtual void SetWindowStyleFlag( long flag );
   virtual long GetWindowStyleFlag() const;

+  

   virtual void CaptureMouse();
   virtual void ReleaseMouse();
   virtual void CaptureMouse();
   virtual void ReleaseMouse();

+  

   virtual void SetTitle( const wxString &title );
   virtual wxString GetTitle() const;
   virtual void SetName( const wxString &name );
   virtual void SetTitle( const wxString &title );
   virtual wxString GetTitle() const;
   virtual void SetName( const wxString &name );


@@ -196,14 +236,16 @@ public:
 
   virtual bool IsShown() const;
 
 
   virtual bool IsShown() const;
 

-  virtual void Raise(void);
-  virtual void Lower(void);
+  virtual void Raise();
+  virtual void Lower();

 
   virtual bool IsRetained();
   virtual wxWindow *FindWindow( long id );
   virtual wxWindow *FindWindow( const wxString& name );
 
   virtual bool IsRetained();
   virtual wxWindow *FindWindow( long id );
   virtual wxWindow *FindWindow( const wxString& name );

+  

   void AllowDoubleClick( bool WXUNUSED(allow) ) {};
   void SetDoubleClick( bool WXUNUSED(allow) ) {};
   void AllowDoubleClick( bool WXUNUSED(allow) ) {};
   void SetDoubleClick( bool WXUNUSED(allow) ) {};

+  

   virtual void ClientToScreen( int *x, int *y );
   virtual void ScreenToClient( int *x, int *y );
 
   virtual void ClientToScreen( int *x, int *y );
   virtual void ScreenToClient( int *x, int *y );
 


@@ -227,23 +269,32 @@ public:
   virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
 
   virtual bool AcceptsFocus() const;
   virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
 
   virtual bool AcceptsFocus() const;

+  

   void UpdateWindowUI();
 
   // implementation
   
   void UpdateWindowUI();
 
   // implementation
   

-  virtual GtkWidget* GetConnectWidget(void);
-  virtual bool IsOwnGtkWindow( GdkWindow *window );
-  void ConnectWidget( GtkWidget *widget );
-  void ConnectDnDWidget( GtkWidget *widget );
-  void DisconnectDnDWidget( GtkWidget *widget );
+          void        PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
+                                   const wxSize &size, long style, const wxString &name );
+          void        PostCreation();
+  virtual GtkWidget  *GetConnectWidget();
+  virtual bool        IsOwnGtkWindow( GdkWindow *window );
+          void        ConnectWidget( GtkWidget *widget );
+          void        ConnectDnDWidget( GtkWidget *widget );
+          void        DisconnectDnDWidget( GtkWidget *widget );
+  
+          bool        HasVMT();
+  
+  virtual void        ImplementSetSize();
+  virtual void        ImplementSetPosition();
+  
+  virtual wxPoint     GetClientAreaOrigin() const;
+  virtual void        AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
+
+          GtkStyle   *GetWidgetStyle();
+          void        SetWidgetStyle();
+  virtual void        ApplyWidgetStyle();

   
   

-  void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
-    const wxSize &size, long style, const wxString &name );
-  void PostCreation();
-  bool HasVMT();
-  virtual void ImplementSetSize();
-  virtual void ImplementSetPosition();
-  GtkStyle *GetWidgetStyle();

 
   wxWindow            *m_parent;
   wxList               m_children;
 
   wxWindow            *m_parent;
   wxList               m_children;


@@ -254,7 +305,7 @@ public:
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;

-  wxDropTarget        *m_pDropTarget;
+  wxDropTarget        *m_dropTarget;

   wxWindowID           m_windowId;
   wxCursor            *m_cursor;
   wxFont               m_font;
   wxWindowID           m_windowId;
   wxCursor            *m_cursor;
   wxFont               m_font;


@@ -266,6 +317,8 @@ public:
   bool                 m_isEnabled;
   wxString             m_windowName;
   wxAcceleratorTable   m_acceleratorTable;
   bool                 m_isEnabled;
   wxString             m_windowName;
   wxAcceleratorTable   m_acceleratorTable;

+  wxClientData        *m_clientObject;
+  void                *m_clientData;

 
   GtkWidget           *m_widget;
   GtkWidget           *m_wxwindow;
 
   GtkWidget           *m_widget;
   GtkWidget           *m_wxwindow;


@@ -280,6 +333,8 @@ public:
   bool                 m_resizing;
   GdkGC               *m_scrollGC;
   GtkStyle            *m_widgetStyle;
   bool                 m_resizing;
   GdkGC               *m_scrollGC;
   GtkStyle            *m_widgetStyle;

+  
+  wxInsertChildFunction  m_insertCallback;

 
 public:
 
 
 public: