wxPopupWindow::GetPosition() should return point in screen coords now

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 5330bcfb8f12878206c5195e52e158c714c4bbbe..092a589d871b676d7e354325f4b44a3ef9fc9d34 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -20,48 +20,74 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
  public:
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
  public:

-  inline wxButton() {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
+    inline wxButton() {}
+    inline wxButton( wxWindow*          pParent
+                    ,wxWindowID         vId
+                    ,const wxString&    rsLabel
+                    ,const wxPoint&     rPos = wxDefaultPosition
+                    ,const wxSize&      rSize = wxDefaultSize
+                    ,long               lStyle = 0

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-           const wxValidator& validator = wxDefaultValidator,
+                    ,const wxValidator& rValidator = wxDefaultValidator

 #endif
 #endif

-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+                    ,const wxString&    rsName = wxButtonNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rsLabel
+               ,rPos
+               ,rSize
+               ,lStyle
+#if wxUSE_VALIDATORS
+               ,rValidator
+#endif
+               ,rsName
+              );
+    }

 
 

-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxString&    rsLabel
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-           const wxValidator& validator = wxDefaultValidator,
+                ,const wxValidator& rValidator = wxDefaultValidator

 #endif
 #endif

-           const wxString& name = wxButtonNameStr);
+                ,const wxString&    rsName = wxButtonNameStr
+               );

 
 

-  virtual ~wxButton();
+    virtual ~wxButton();

 
 

-  virtual void SetDefault();
+    virtual void     SetDefault(void);
+    static wxSize    GetDefaultSize(void);
+    virtual void     Command(wxCommandEvent& rEvent);
+    virtual bool     OS2Command( WXUINT uParam
+                                ,WXWORD vId
+                               );
+    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
+                                ,WXHWND   hWnd
+                                ,WXUINT   uCtlColor
+                                ,WXUINT   uMessage
+                                ,WXWPARAM wParam
+                                ,WXLPARAM lParam
+                               );
+    void          MakeOwnerDrawn(void);

 
 

-  static wxSize GetDefaultSize();
+    virtual MRESULT WindowProc( WXUINT   uMsg
+                               ,WXWPARAM wParam
+                               ,WXLPARAM lParam
+                              );

 
 

-  virtual void Command(wxCommandEvent& event);
-  virtual bool OS2Command(WXUINT param, WXWORD id);
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC,
-                              WXHWND pWnd,
-                              WXUINT nCtlColor,
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam);

 protected:
 protected:

-    // send a notification event, return TRUE if processed
-    bool SendClickEvent();

 
 

-    virtual wxSize DoGetBestSize() const;
+    bool           SendClickEvent(void);
+    virtual wxSize DoGetBestSize(void) const;

 private:
   DECLARE_DYNAMIC_CLASS(wxButton)
 private:
   DECLARE_DYNAMIC_CLASS(wxButton)

-};
+}; // end of CLASS wxButton

 
 #endif
     // _WX_BUTTON_H_
 
 #endif
     // _WX_BUTTON_H_

+