*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/os2/gauge.h

@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.h
 // Purpose:     wxGauge class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/06/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
-#ifdef __GNUG__
-#pragma interface "gauge.h"
-#endif
-
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
@@ -56,7 +52,8 @@ class WXDLLEXPORT wxGauge: public wxControl
   int GetRange() const ;
   int GetValue() const ;
 
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  bool SetForegroundColour(const wxColour& col);
+  bool SetBackgroundColour(const wxColour& col);
 
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 

include/wx/os2/gdiobj.h

@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gdiobj.h
 // Purpose:     wxGDIObject class: base class for other GDI classes
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,10 +14,6 @@
 
 #include "wx/object.h"
 
-#ifdef __GNUG__
-#pragma interface "gdiobj.h"
-#endif
-
 class WXDLLEXPORT wxGDIRefData: public wxObjectRefData {
 public:
     inline wxGDIRefData()
@@ -34,6 +30,14 @@ DECLARE_DYNAMIC_CLASS(wxGDIObject)
   inline wxGDIObject() { m_visible = FALSE; };
   inline ~wxGDIObject() {};
 
+  // Creates the resource
+  virtual bool RealizeResource(void) { return FALSE; };
+
+  // Frees the resource
+  virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; };
+
+  virtual bool IsFree(void) const { return FALSE; };
+
   inline bool IsNull() const { return (m_refData == 0); }
 
   virtual bool GetVisible() { return m_visible; }

src/os2/gdiobj.cpp

@@ -9,9 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+// For compilers that support precompilation, includes "wx.h".
-#pragma implementation "gdiobj.h"
+#include "wx/wxprec.h"
-#endif
 
 #include "wx/gdiobj.h"
 

src/os2/makefile.va

@@ -311,6 +311,8 @@ OS2OBJS = \
   ..\os2\$D\font.obj \
   ..\os2\$D\fontdlg.obj \
   ..\os2\$D\frame.obj \
+  ..\os2\$D\gauge.obj \
+  ..\os2\$D\gdiobj.obj \
   ..\os2\$D\window.obj
 
 OS2LIBOBJS = \
@@ -342,6 +344,8 @@ OS2LIBOBJS = \
   font.obj \
   fontdlg.obj \
   frame.obj \
+  gauge.obj \
+  gdiobj.obj \
   window.obj
 
 HTMLOBJS = \
@@ -517,6 +521,8 @@ $(OS2LIBOBJS):
   copy ..\os2\$D\font.obj
   copy ..\os2\$D\fontdlg.obj
   copy ..\os2\$D\frame.obj
+  copy ..\os2\$D\gauge.obj
+  copy ..\os2\$D\gdiobj.obj
   copy ..\os2\$D\window.obj
 
 # wxWindows library as DLL