Merge branch 'dgud/wx/separate-opengl' into dev

* dgud/wx/separate-opengl:
  Fix non available opengl functions
  Add lib paths for *bsd variants
  Initilize opengl after setCurrent
  Update to OpenGL 4.1
  Remove ostype sub dirs below wx/priv
  Windows and Mac build issues
  Add dialyser spec
  Better make dependecies for api generation
  Split opengl functionality into separate dynamic library

1 files changed, 24 insertions, 23 deletions

diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 6bafda5b9d..aec8a4944a 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -505,15 +505,15 @@
 	      {"data",[in,{base,binary}]},
 	      {"alpha",[in,{base,binary}]},
 	      {{4,pre_hook}, 
-	       "if(!static_data) {"
-	       "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	       "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"},
+	       [{c, "if(!static_data) {"
+		 "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		 "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]},
 	      {{5,pre_hook}, 
-	       "if(!static_data) {"
-	       " data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	       " alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
-	       " memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
-	       " memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}
+	       [{c, "if(!static_data) {"
+		 " data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		 " alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
+		 " memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
+		 " memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}]}
 	     ]},
   '~wxImage',%'AddHandler',
   'Blur','BlurHorizontal','BlurVertical', 
@@ -524,15 +524,15 @@
 	     {"data",[in,{base,binary}]},
 	     {"alpha",[in,{base,binary}]},
 	     {{4,pre_hook}, 
-	      "if(!static_data) {"
-	      "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	      "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"},
+	      [{c, "if(!static_data) {"
+	       "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+	       "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]},
 	     {{5,pre_hook}, 
-	      "if(!static_data) {"
-	      " data =  (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	      " alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
-	      " memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
-	      " memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}	     
+	      [{c, "if(!static_data) {"
+		" data =  (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		" alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
+		" memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
+		" memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}]}
 	    ]},
   'Destroy','FindFirstUnusedColour', %  'FindHandler',
   'GetImageExtWildcard',
@@ -551,15 +551,15 @@
   'Rotate90','SaveFile','Scale','Size',
   {'SetAlpha', [{{2,"alpha"},[in,{base,binary}, {def, none}]},
 		{{2,pre_hook}, 
-		 "if(!static_data) {"
-		 "alpha = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-		 "memcpy(alpha,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}
+		 [{c, "if(!static_data) {"
+		   "alpha = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		   "memcpy(alpha,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]}
 	       ]},
   {'SetData',  [{"data",[in,{base,binary}]},
 		{pre_hook, 
-		 "if(!static_data) {"
-		 "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-		 "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}
+		 [{c, "if(!static_data) {"
+		   "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		   "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]}
 	       ]},
  'SetMask','SetMaskColour','SetMaskFromImage','SetOption',
   'SetPalette',
@@ -1148,7 +1148,8 @@
  [{skip, [{'SetCurrent', 2}]}], %% NA MAC
  [{'wxGLCanvas', [{"attribList", [in, {single,array}]}]},
   'GetContext',
-  {'SetCurrent', [{post_hook,"if(This->GetContext()) setActiveGL(Ecmd.caller,This)"}]},
+  {'SetCurrent', [{post_hook,[{c, "if(This->GetContext()) setActiveGL(Ecmd.caller,This)"},
+			      {erl, "{ok, _} = wxe_master:init_opengl(),"}]}]},
   %%{'SetColour', [{"colour", [in, {single,array}]}]},
   'SwapBuffers']}.