Fix documentation and callback options in wxListCtrl:create/3

1 files changed, 97 insertions, 37 deletions

diff --git a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
index 6443c02be2..54d6fafd01 100644
--- a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
+++ b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
@@ -17,30 +17,25 @@
 %% %CopyrightEnd%
 %%
 
-<<SortItems
-case ~s: { // wxListCtrl::SortItems taylormade
-  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
-  int sortCallback=*(int *) bp; bp += 4;
-  if(!This) throw wxe_badarg(0);
 
-  callbackInfo* cb = new callbackInfo();
-  cb->port = Ecmd.port;
-  cb->callbackID = sortCallback;
-  bool Result = This->SortItems(wxEListCtrlCompare, (long)cb);
-  delete cb;
+<<wxListCtrl_class
+class EwxListCtrl : public wxListCtrl {
+ public: ~EwxListCtrl();
+ EwxListCtrl(wxWindow * parent,wxWindowID winid,const wxPoint& pos,const wxSize& size,long style,const wxValidator& validator) : wxListCtrl(parent,winid,pos,size,style,validator) {};
+ EwxListCtrl() : wxListCtrl() {};
 
-  /* Destroy the callback, see wxEPrintout::clear_cb */
-  wxeReturn cbrt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-  // NOTE: Remove this later when changing from funs to gen_server
-  cbrt.addAtom("wx_delete_cb");
-  cbrt.addInt(sortCallback);
-  cbrt.addTupleCount(2);
-  cbrt.send();
+ int onGetItemText;
+ int onGetItemAttr;
+ int onGetItemColumnImage;
+ ErlDrvPort port;
 
-  rt.addBool(Result);
-  break;
-}
-SortItems>>
+ private:
+ virtual wxString OnGetItemText(long item, long col) const;
+ virtual wxListItemAttr* OnGetItemAttr(long item) const;
+ virtual int OnGetItemImage(long item) const;
+ virtual int OnGetItemColumnImage(long item, long column) const;
+};
+wxListCtrl_class>>
 
 <<wxListCtrl_new_0
 case ~s: { // wxListCtrl::wxListCtrl
@@ -105,21 +100,86 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
 }
 wxListCtrl_new_2>>
 
-<<wxListCtrl_class
-class EwxListCtrl : public wxListCtrl {
- public: ~EwxListCtrl();
- EwxListCtrl(wxWindow * parent,wxWindowID winid,const wxPoint& pos,const wxSize& size,long style,const wxValidator& validator) : wxListCtrl(parent,winid,pos,size,style,validator) {};
- EwxListCtrl() : wxListCtrl() {};
+<<Create
+case ~s: { // wxListCtrl::Create
+ wxWindowID winid=wxID_ANY;
+ wxPoint pos= wxDefaultPosition;
+ wxSize size= wxDefaultSize;
+ long style=wxLC_ICON;
+ const wxValidator * validator= &wxDefaultValidator;
+ EwxListCtrl *This = (EwxListCtrl *) getPtr(bp,memenv); bp += 4;
+ wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+ winid = (wxWindowID)*(int *) bp; bp += 4;
+  } break;
+  case 2: {bp += 4;
+ int * posX = (int *) bp; bp += 4;
+ int * posY = (int *) bp; bp += 4;
+ pos = wxPoint(*posX,*posY);
+ bp += 4; /* Align */
+  } break;
+  case 3: {bp += 4;
+ int * sizeW = (int *) bp; bp += 4;
+ int * sizeH = (int *) bp; bp += 4;
+ size = wxSize(*sizeW,*sizeH);
+ bp += 4; /* Align */
+  } break;
+  case 4: {bp += 4;
+ style = (long)*(int *) bp; bp += 4;
+  } break;
+  case 5: {bp += 4;
+validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
+  } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
+ }};
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->Create(parent,winid,pos,size,style,*validator);
+ This->onGetItemText = onGetItemText;
+ This->onGetItemAttr = onGetItemAttr;
+ This->onGetItemColumnImage = onGetItemColumnImage;
+ This->port = Ecmd.port;
+
+ rt.addBool(Result);
+ break;
+}
+Create>>
+
+<<SortItems
+case ~s: { // wxListCtrl::SortItems taylormade
+  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
+  int sortCallback=*(int *) bp; bp += 4;
+  if(!This) throw wxe_badarg(0);
+
+  callbackInfo* cb = new callbackInfo();
+  cb->port = Ecmd.port;
+  cb->callbackID = sortCallback;
+  bool Result = This->SortItems(wxEListCtrlCompare, (long)cb);
+  delete cb;
+
+  /* Destroy the callback, see wxEPrintout::clear_cb */
+  wxeReturn cbrt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
+  // NOTE: Remove this later when changing from funs to gen_server
+  cbrt.addAtom("wx_delete_cb");
+  cbrt.addInt(sortCallback);
+  cbrt.addTupleCount(2);
+  cbrt.send();
+
+  rt.addBool(Result);
+  break;
+}
+SortItems>>
+
 
- int onGetItemText;
- int onGetItemAttr;
- int onGetItemColumnImage;
- ErlDrvPort port;
 
- private:
- virtual wxString OnGetItemText(long item, long col) const;
- virtual wxListItemAttr* OnGetItemAttr(long item) const;
- virtual int OnGetItemImage(long item) const;
- virtual int OnGetItemColumnImage(long item, long column) const;
-};
-wxListCtrl_class>>
\ No newline at end of file