globally renamed uint to size_t. This has _not_ been checked under Windows,

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 0f1d410cf75b4fb6079a4826aabbbf49cc3541b6..36ff555db3cf2aa757c83209ba3a8347199c06c6 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -40,6 +40,8 @@ extern wxList wxTopLevelWindows;
 
 class wxLayoutConstraints;
 class wxSizer;
 
 class wxLayoutConstraints;
 class wxSizer;

+class wxResourceTable;
+class wxItemResource;

 
 class wxWindow;
 class wxCanvas;
 
 class wxWindow;
 class wxCanvas;


@@ -60,13 +62,24 @@ class wxWindow: public wxEvtHandler
 {
 public:
   wxWindow();
 {
 public:
   wxWindow();

-  wxWindow( 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 );
+  inline wxWindow(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = 0,
+           const wxString& name = wxPanelNameStr)
+  {
+      Create(parent, id, pos, size, style, name);
+  }
+  bool Create(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = 0,
+           const wxString& name = wxPanelNameStr);

   virtual ~wxWindow();
   virtual ~wxWindow();

+
+  virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
+  virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
+

   bool Close( bool force = FALSE );
   virtual bool Destroy();
   virtual bool DestroyChildren();
   bool Close( bool force = FALSE );
   virtual bool Destroy();
   virtual bool DestroyChildren();


@@ -82,7 +95,11 @@ public:
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void GetPosition( int *x, int *y ) const;
   virtual void Centre( int direction = wxHORIZONTAL );
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void GetPosition( int *x, int *y ) const;
   virtual void Centre( int direction = wxHORIZONTAL );

+  inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }

   virtual void Fit();
   virtual void Fit();

+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
+    int WXUNUSED(maxH), int WXUNUSED(incW),  int WXUNUSED(incH) ) { }

 
   void OnSize( wxSizeEvent &event );
   void OnIdle( wxIdleEvent& event );
 
   void OnSize( wxSizeEvent &event );
   void OnIdle( wxIdleEvent& event );


@@ -90,7 +107,8 @@ public:
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
   virtual void MakeModal( bool modal );
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
   virtual void MakeModal( bool modal );

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

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


@@ -99,7 +117,12 @@ public:
   virtual void RemoveChild( wxWindow *child );
   void SetReturnCode( int retCode );
   int GetReturnCode();
   virtual void RemoveChild( wxWindow *child );
   void SetReturnCode( int retCode );
   int GetReturnCode();

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

 
   wxEvtHandler *GetEventHandler();
   void SetEventHandler( wxEvtHandler *handler );
 
   wxEvtHandler *GetEventHandler();
   void SetEventHandler( wxEvtHandler *handler );


@@ -107,7 +130,7 @@ public:
   wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
 
   virtual wxValidator *GetValidator();
   wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
 
   virtual wxValidator *GetValidator();

-  virtual void SetValidator( wxValidator *validator );
+  virtual void SetValidator( const wxValidator &validator );

 
   bool IsBeingDeleted();
 
 
   bool IsBeingDeleted();
 


@@ -123,15 +146,24 @@ public:
 
   virtual wxColour GetBackgroundColour() const;
   virtual void SetBackgroundColour( const wxColour &colour );
 
   virtual wxColour GetBackgroundColour() const;
   virtual void SetBackgroundColour( const wxColour &colour );

+  virtual wxColour GetForegroundColour() const;
+  virtual void SetForegroundColour( const wxColour &colour );
+
+  virtual int GetCharHeight(void) const;
+  virtual int GetCharWidth(void) const;
+  virtual void GetTextExtent( const wxString& string, int *x, int *y,
+                             int *descent = NULL,
+                             int *externalLeading = NULL,
+                             const wxFont *theFont = NULL, bool use16 = FALSE) const;

 
   virtual void SetDefaultBackgroundColour( const wxColour& col )
 
   virtual void SetDefaultBackgroundColour( const wxColour& col )

-    { m_defaultBackgroundColour = col; };
+    { m_defaultBackgroundColour = col; }

   virtual wxColour GetDefaultBackgroundColour() const
   virtual wxColour GetDefaultBackgroundColour() const

-    { return m_defaultBackgroundColour; };
+    { return m_defaultBackgroundColour; }

   virtual void SetDefaultForegroundColour( const wxColour& col )
   virtual void SetDefaultForegroundColour( const wxColour& col )

-    { m_defaultForegroundColour = col; };
+    { m_defaultForegroundColour = col; }

   virtual wxColour GetDefaultForegroundColour() const
   virtual wxColour GetDefaultForegroundColour() const

-    { return m_defaultForegroundColour; };
+    { return m_defaultForegroundColour; }

 
   virtual void SetFont( const wxFont &font );
   virtual wxFont *GetFont();
 
   virtual void SetFont( const wxFont &font );
   virtual wxFont *GetFont();


@@ -170,15 +202,16 @@ public:
   virtual bool TransferDataFromWindow();
   void OnInitDialog( wxInitDialogEvent &event );
   virtual void InitDialog();
   virtual bool TransferDataFromWindow();
   void OnInitDialog( wxInitDialogEvent &event );
   virtual void InitDialog();

-  
+

   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;

-  
-private:
+
+//private:

   virtual GtkWidget* GetConnectWidget(void);
   virtual GtkWidget* GetConnectWidget(void);

-  
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+

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


@@ -194,7 +227,7 @@ public:
   // update the UI state (called from OnIdle)
   void UpdateWindowUI();
 
   // update the UI state (called from OnIdle)
   void UpdateWindowUI();
 

-  
+

 public:         // cannot get private going yet
 
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
 public:         // cannot get private going yet
 
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,


@@ -203,7 +236,6 @@ public:         // cannot get private going yet
   bool HasVMT();
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
   bool HasVMT();
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();

-  void GetDrawingOffset( long *x, long *y );

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


@@ -225,7 +257,6 @@ public:         // cannot get private going yet
   bool            m_isShown;
   bool            m_isEnabled;
   wxString        m_windowName;
   bool            m_isShown;
   bool            m_isEnabled;
   wxString        m_windowName;

-  long            m_drawingOffsetX,m_drawingOffsetY;

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