define _TM_DEFINED if we define struct tm here

[wxWidgets.git] / include / wx / msw / statbr95.h

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 022c4e51ee382d87295d7e0d51c09f24a76ca6bc..e611e4a00ac1f60bd6d7b63cdafb96aec8750309 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -12,10 +12,6 @@
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "statbr95.h"
-#endif
-

 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase


@@ -61,6 +57,9 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 

+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);

 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();


@@ -68,10 +67,6 @@ protected:
     // override base class virtual
     void DoMoveWindow(int x, int y, int width, int height);
 
     // override base class virtual
     void DoMoveWindow(int x, int y, int width, int height);
 

-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);
-

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
 };