Some corrections

[wxWidgets.git] / include / wx / os2 / frame.h

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 1ff9224fac808a8bab18201597ca1eae41d3b112..e2b86e739fabb68421ffa413a39d508c8751014b 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -12,6 +12,11 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
+//
+// Get the default resource ID's for frames
+//
+#include "wx/os2/wxOs2.h"
+
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
@@ -53,7 +58,7 @@ public:
     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
                                );
-    virtual bool IsFullScreen(void) const { return m_fsIsShowing; };
+    virtual bool IsFullScreen(void) const { return m_bFsIsShowing; };
 
 
     // implementation only from now on
@@ -91,9 +96,9 @@ public:
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool bUseNative)
-        { m_useNativeStatusBar = useNative; };
+        { m_bUseNativeStatusBar = bUseNative; };
     static bool UsesNativeStatusBar()
-        { return m_useNativeStatusBar; };
+        { return m_bUseNativeStatusBar; };
 #endif // wxUSE_STATUSBAR
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
@@ -131,8 +136,8 @@ public:
 
     // tooltip management
 #if wxUSE_TOOLTIPS
-    WXHWND GetToolTipCtrl(void) const { return m_hwndToolTip; }
-    void   SetToolTipCtrl(WXHWND hHwndTT) { m_hwndToolTip = hwndTT; }
+    WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
+    void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
 #endif // tooltips
 
 protected:
@@ -194,7 +199,7 @@ protected:
 
 private:
 #if wxUSE_TOOLTIPS
-    WXHWND                          m_hHwndToolTip;
+    WXHWND                          m_hWndToolTip;
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()