A few tweaks and cleanups

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

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 8f49bb12fe195584d9a2074e1c74cc44a1bf9aba..e9045aacf6bbacc029cc09a013d8db06f27a3d35 100644 (file)
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -16,7 +16,7 @@
     #pragma interface "toplevel.h"
 #endif
 
-enum ETemplateID { kResizeableDialog = 1000
+enum ETemplateID { kResizeableDialog = 127
                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };
@@ -65,7 +65,10 @@ public:
            virtual bool IsMaximized(void) const;
            virtual void Maximize(bool bMaximize = TRUE);
            virtual void Restore(void);
+           virtual void SendSizeEvent(void);
            virtual void SetIcon(const wxIcon& rIcon);
+           virtual void SetIcons(const wxIconBundle& rIcons);
+
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow
                                        ,long lStyle = wxFULLSCREEN_ALL
@@ -82,10 +85,7 @@ public:
     // Implementation from now on
     // --------------------------
     //
-           virtual void AlterChildPos(void); // OS/2 child control positioning
-           virtual void UpdateInternalSize( wxWindow* pChild
-                                           ,int       nHeight
-                                          );
+           PSWP         GetSwpClient(void) { return &m_vSwpClient; }
 protected:
     //
     // Common part of all ctors
@@ -126,13 +126,11 @@ protected:
                                 ) const;
 
     //
-    // Get the OS/2 window flags corresponding to wxWindows ones
-    //
-    // The functions returns the flags (WS_XXX) directly and puts the ext
-    // (WS_EX_XXX) flags into the provided pointer if not NULL
+    // Translate wxWindows flags into OS flags
     //
-    long OS2GetCreateWindowFlags(long* lExflags) const;
-
+    virtual WXDWORD OS2GetStyle( long     lFlag
+                                ,WXDWORD* pdwExstyle
+                               ) const;
     //
     // Is the frame currently iconized?
     //
@@ -156,6 +154,7 @@ protected:
     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
+    static bool                     m_sbInitialized;
 }; // end of CLASS wxTopLevelWindowOS2
 
 //