tried to fix compilation for mingw32 and wxGTK/Motif in the same time

[wxWidgets.git] / include / wx / qt / stattext.h

diff --git a/include/wx/qt/stattext.h b/include/wx/qt/stattext.h
index e60303c890cd2df19c0a51b2cf5c37c0a742112f..aa8eaf229eb9731065a8474cffd145c543ad046e 100644 (file)
--- a/include/wx/qt/stattext.h
+++ b/include/wx/qt/stattext.h
@@ -1,57 +1,56 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h

-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxStaticText class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR

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

-
-#ifndef __GTKSTATICTEXTH__
-#define __GTKSTATICTEXTH__
+#ifndef _WX_STATTEXT_H_
+#define _WX_STATTEXT_H_

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "stattext.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticText;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxStaticTextNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;

 
 

-//-----------------------------------------------------------------------------
-// wxStaticText
-//-----------------------------------------------------------------------------
-
-class wxStaticText: public wxControl
+class WXDLLEXPORT wxStaticText: public wxControl

 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)

-
-  public:
-
-    wxStaticText(void);
-    wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxStaticTextNameStr );
-    bool Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxStaticTextNameStr );
-    wxString GetLabel(void) const;
-    void SetLabel( const wxString &label );
+ public:
+  inline wxStaticText() { }
+
+  inline wxStaticText(wxWindow *parent, wxWindowID id,
+           const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = 0,
+           const wxString& name = wxStaticTextNameStr)
+  {
+    Create(parent, id, label, pos, size, style, name);
+  }
+
+  bool Create(wxWindow *parent, wxWindowID id,
+           const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = 0,
+           const wxString& name = wxStaticTextNameStr);
+
+  // accessors
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetLabel(const wxString&);
+
+  // operations
+  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
+  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};

 };
 
 };
 

-#endif // __GTKSTATICTEXTH__
+#endif
+    // _WX_STATTEXT_H_