fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index b29732525cc9607693d7e8044fa237bc064727e7..64f808bbadd4203ac56dd766216e3f4844f84ace 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -12,11 +12,7 @@
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "frame.h"
-#endif
-
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase

 {
 public:
     wxFrame() { Init(); }
 {
 public:
     wxFrame() { Init(); }


@@ -52,7 +48,6 @@ public:
     void SetTitle(const wxString& title);
 
     // Set icon
     void SetTitle(const wxString& title);
 
     // Set icon

-    virtual void SetIcon(const wxIcon& icon);

     virtual void SetIcons(const wxIconBundle& icons);
 
 #if wxUSE_STATUSBAR
     virtual void SetIcons(const wxIconBundle& icons);
 
 #if wxUSE_STATUSBAR


@@ -92,10 +87,9 @@ public:
 
     bool PreResize();
 
 
     bool PreResize();
 

-    void SendSizeEvent();
-

     // for generic/mdig.h
     virtual void DoGetClientSize(int *width, int *height) const;
     // for generic/mdig.h
     virtual void DoGetClientSize(int *width, int *height) const;

+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();


@@ -117,7 +111,7 @@ private:
     virtual void DoSetClientSize(int width, int height);
 
 private:
     virtual void DoSetClientSize(int width, int height);
 
 private:

-    virtual bool DoCreate(wxWindow* parent,
+    virtual bool XmDoCreateTLW(wxWindow* parent,

                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,


@@ -126,11 +120,6 @@ private:
                                const wxString& name);
 
 
                                const wxString& name);
 
 

-#if wxCHECK_VERSION(2,7,0)
-    #error "Remove DoDestroy(), it was only kept for binary backwards compatibility"
-#endif
-
-    virtual void DoDestroy();

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)